diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-09-20 16:31:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-20 16:31:44 -0400 |
| commit | f3c359800a226388ea059801598cf7d8e4e95b1c (patch) | |
| tree | 8a6f5b9230c81483405bb258ad0589bbe4cb01a2 /activejob | |
| parent | b45b96b91fc62e7488002cb05c96ec78577f7873 (diff) | |
| parent | 69e0e0acf9a286a41f1adaae8e3e04b3a34101a1 (diff) | |
| download | rails-f3c359800a226388ea059801598cf7d8e4e95b1c.tar.gz rails-f3c359800a226388ea059801598cf7d8e4e95b1c.tar.bz2 rails-f3c359800a226388ea059801598cf7d8e4e95b1c.zip | |
Merge pull request #33906 from dark-panda/ignore-psqlrc-when-using-psql
Ignore psqlrc files when executing psql commands
Diffstat (limited to 'activejob')
| -rw-r--r-- | activejob/test/support/integration/adapters/que.rb | 4 | ||||
| -rw-r--r-- | activejob/test/support/integration/adapters/queue_classic.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/activejob/test/support/integration/adapters/que.rb b/activejob/test/support/integration/adapters/que.rb index 2a771b08c7..2e7d327b37 100644 --- a/activejob/test/support/integration/adapters/que.rb +++ b/activejob/test/support/integration/adapters/que.rb @@ -18,8 +18,8 @@ module QueJobsManager user = uri.user || ENV["USER"] pass = uri.password db = uri.path[1..-1] - %x{#{"PGPASSWORD=\"#{pass}\"" if pass} psql -c 'drop database if exists "#{db}"' -U #{user} -t template1} - %x{#{"PGPASSWORD=\"#{pass}\"" if pass} psql -c 'create database "#{db}"' -U #{user} -t template1} + %x{#{"PGPASSWORD=\"#{pass}\"" if pass} psql -X -c 'drop database if exists "#{db}"' -U #{user} -t template1} + %x{#{"PGPASSWORD=\"#{pass}\"" if pass} psql -X -c 'create database "#{db}"' -U #{user} -t template1} Que.connection = Sequel.connect(que_url) Que.migrate! diff --git a/activejob/test/support/integration/adapters/queue_classic.rb b/activejob/test/support/integration/adapters/queue_classic.rb index 1b0685a971..dbbdc12b9d 100644 --- a/activejob/test/support/integration/adapters/queue_classic.rb +++ b/activejob/test/support/integration/adapters/queue_classic.rb @@ -17,8 +17,8 @@ module QueueClassicJobsManager user = uri.user || ENV["USER"] pass = uri.password db = uri.path[1..-1] - %x{#{"PGPASSWORD=\"#{pass}\"" if pass} psql -c 'drop database if exists "#{db}"' -U #{user} -t template1} - %x{#{"PGPASSWORD=\"#{pass}\"" if pass} psql -c 'create database "#{db}"' -U #{user} -t template1} + %x{#{"PGPASSWORD=\"#{pass}\"" if pass} psql -X -c 'drop database if exists "#{db}"' -U #{user} -t template1} + %x{#{"PGPASSWORD=\"#{pass}\"" if pass} psql -X -c 'create database "#{db}"' -U #{user} -t template1} QC::Setup.create QC.default_conn_adapter.disconnect |