Merge pull request #1021 from flaviogurgel/fixpsqlrc

Ignore .psqlrc so output is clean and doesn't break Puppet

Author: david22swan

lib/puppet/provider/postgresql_psql/ruby.rb

@@ -13,7 +13,7 @@ def run_sql_command(sql)
     command = [resource[:psql_path]]
     command.push('-d', resource[:db]) if resource[:db]
     command.push('-p', resource[:port]) if resource[:port]
-    command.push('-t', '-c', '"' + sql.gsub('"', '\"') + '"')
+    command.push('-t', '-X', '-c', '"' + sql.gsub('"', '\"') + '"')
 
     environment = get_environment
 

spec/unit/puppet/provider/postgresql_psql/ruby_spec.rb

@@ -13,7 +13,7 @@
 
       it 'executes with the given psql_path on the given DB' do
         expect(provider).to receive(:run_command).with(['psql', '-d',
-                                                        attributes[:db], '-t', '-c', '"SELECT \'something\' as \"Custom column\""'], 'postgres',
+                                                        attributes[:db], '-t', '-X', '-c', '"SELECT \'something\' as \"Custom column\""'], 'postgres',
                                                        'postgres', {})
 
         provider.run_sql_command('SELECT \'something\' as "Custom column"')
@@ -33,7 +33,7 @@
       it 'executes with the given psql_path on the given DB' do
         expect(Dir).to receive(:chdir).with(attributes[:cwd]).and_yield
         expect(provider).to receive(:run_command).with([attributes[:psql_path],
-                                                        '-d', attributes[:db], '-t', '-c', '"SELECT \'something\' as \"Custom column\""'],
+                                                        '-d', attributes[:db], '-t', '-X', '-c', '"SELECT \'something\' as \"Custom column\""'],
                                                        attributes[:psql_user], attributes[:psql_group], {})
 
         provider.run_sql_command('SELECT \'something\' as "Custom column"')
@@ -47,7 +47,7 @@
       end
 
       it 'executes with the given search_path' do
-        expect(provider).to receive(:run_command).with(['psql', '-t', '-c',
+        expect(provider).to receive(:run_command).with(['psql', '-t', '-X', '-c',
                                                         '"set search_path to schema1; SELECT \'something\' as \"Custom column\""'],
                                                        'postgres', 'postgres', {})
 
@@ -62,7 +62,7 @@
       end
 
       it 'executes with the given search_path' do
-        expect(provider).to receive(:run_command).with(['psql', '-t', '-c',
+        expect(provider).to receive(:run_command).with(['psql', '-t', '-X', '-c',
                                                         '"set search_path to schema1,schema2; SELECT \'something\' as \"Custom column\""'],
                                                        'postgres', 'postgres',
                                                        {})
@@ -77,7 +77,7 @@
     it 'executes with the given port' do
       expect(provider).to receive(:run_command).with(['psql',
                                                       '-p', '5555',
-                                                      '-t', '-c', '"SELECT something"'],
+                                                      '-t', '-X', '-c', '"SELECT something"'],
                                                      'postgres', 'postgres', {})
 
       provider.run_sql_command('SELECT something')
@@ -88,7 +88,7 @@
 
     it 'executes with the given host' do
       expect(provider).to receive(:run_command).with(['psql',
-                                                      '-t', '-c',
+                                                      '-t', '-X', '-c',
                                                       '"SELECT something"'],
                                                      'postgres', 'postgres', 'PGHOST' => '127.0.0.1')