diff options
| author | Yves Senn <yves.senn@gmail.com> | 2015-03-25 09:36:49 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2015-03-25 09:42:45 +0100 |
| commit | 30a5cd9c8b728af150e79bb06697de6f1adf2360 (patch) | |
| tree | cd8a9c686eb705c50959d7a55672851cc0d40605 /activerecord/lib | |
| parent | 0f76ea63e12c1f2a251b9eee9189c26a09c97b69 (diff) | |
| parent | 78fb8bb7e168eefd876f1133636d5138b18ba52c (diff) | |
| download | rails-30a5cd9c8b728af150e79bb06697de6f1adf2360.tar.gz rails-30a5cd9c8b728af150e79bb06697de6f1adf2360.tar.bz2 rails-30a5cd9c8b728af150e79bb06697de6f1adf2360.zip | |
Merge pull request #19503 from jasoncodes/no-psqlrc
Avoid loading user's psqlrc when loading test structure
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/tasks/postgresql_database_tasks.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb b/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb index 435708a421..d7da95c8a9 100644 --- a/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb +++ b/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb @@ -67,7 +67,7 @@ module ActiveRecord def structure_load(filename) set_psql_env - Kernel.system("psql -q -f #{Shellwords.escape(filename)} #{configuration['database']}") + Kernel.system("psql -X -q -f #{Shellwords.escape(filename)} #{configuration['database']}") end private |