(maint) Refactor connection string building

 - Note that Persist Security Info = False was removed from the
   Connection String since it's already the default.

Author: Iristyle

lib/puppet_x/sqlserver/sql_connection.rb

@@ -28,19 +28,19 @@ def open(config)
       end
 
       def get_connection_string(config)
-        config = {'database' => 'master'}.merge(config)
-        # Open ADO connection to the SQL Server database
-        connection_string = "Provider=SQLOLEDB.1;"
-        connection_string << "Persist Security Info=False;"
-        connection_string << "User ID=#{config['admin']};"
-        connection_string << "password=#{config['pass']};"
-        connection_string << "Initial Catalog=#{config['database']};"
-        connection_string << "Application Name=Puppet;"
+        params = {
+          'Provider'         => 'SQLOLEDB.1',
+          'User ID'          => config['admin'],
+          'Password'         => config['pass'],
+          'Initial Catalog'  => config['database'] || 'master',
+          'Application Name' => 'Puppet',
+          'Data Source'      => 'localhost'
+        }
         if config['instance'] !~ /^MSSQLSERVER$/
-          connection_string << "Data Source=localhost\\#{config['instance']};"
-        else
-          connection_string << "Data Source=localhost;"
+          params['Data Source'] = "localhost\\#{config['instance']};"
         end
+
+        params.map { |k, v| "#{k}=#{v}" }.join(';')
       end
 
       def command(sql)

spec/unit/puppet_x/sql_connection_spec.rb

@@ -22,7 +22,7 @@ def stub_no_errors
       before :each do
         stub_connection
         @connection.stubs(:State).returns(0)
-        @connection.stubs(:Open).with('Provider=SQLOLEDB.1;Persist Security Info=False;User ID=sa;password=Pupp3t1@;Initial Catalog=master;Application Name=Puppet;Data Source=localhost;')
+        @connection.stubs(:Open).with('Provider=SQLOLEDB.1;User ID=sa;Password=Pupp3t1@;Initial Catalog=master;Application Name=Puppet;Data Source=localhost')
       end
       it 'should not raise an error but populate has_errors with message' do
         subject.stubs(:win32_exception).returns(Exception)
@@ -48,11 +48,11 @@ def stub_no_errors
         @connection.stubs(:State).returns(0)
       end
       it 'should not add MSSQLSERVER to connection string' do
-        @connection.stubs(:Open).with('Provider=SQLOLEDB.1;Persist Security Info=False;User ID=sa;password=Pupp3t1@;Initial Catalog=master;Application Name=Puppet;Data Source=localhost;')
+        @connection.stubs(:Open).with('Provider=SQLOLEDB.1;User ID=sa;Password=Pupp3t1@;Initial Catalog=master;Application Name=Puppet;Data Source=localhost')
         subject.open_and_run_command('query', {'admin' => 'sa', 'pass' => 'Pupp3t1@', 'instance' => 'MSSQLSERVER'})
       end
       it 'should add a non default instance to connection string' do
-        @connection.stubs(:Open).with('Provider=SQLOLEDB.1;Persist Security Info=False;User ID=superuser;password=puppetTested;Initial Catalog=master;Application Name=Puppet;Data Source=localhost\LOGGING;')
+        @connection.stubs(:Open).with('Provider=SQLOLEDB.1;User ID=superuser;Password=puppetTested;Initial Catalog=master;Application Name=Puppet;Data Source=localhost\LOGGING')
         subject.open_and_run_command('query', {'admin' => 'superuser', 'pass' => 'puppetTested', 'instance' => 'LOGGING'})
       end
     end