diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-09-27 22:40:57 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-27 22:40:57 +0900 |
| commit | 32da8c107a690987b78096acfef1d6ad26b35617 (patch) | |
| tree | f9a17e550f724f74e9fb2e40d86e5c889e426fa1 /activerecord/lib | |
| parent | ff1b4eb35ecac420d71c552402e1192551413a5f (diff) | |
| parent | dbc0da42d67262855a2b911631821933ec09da69 (diff) | |
| download | rails-32da8c107a690987b78096acfef1d6ad26b35617.tar.gz rails-32da8c107a690987b78096acfef1d6ad26b35617.tar.bz2 rails-32da8c107a690987b78096acfef1d6ad26b35617.zip | |
Merge pull request #34001 from dark-panda/ignore-psqlrc-when-using-psql
Use -X when loading structure.sql via psql
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 6d7dc05847..d3c85b161e 100644 --- a/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb +++ b/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb @@ -82,7 +82,7 @@ module ActiveRecord def structure_load(filename, extra_flags) set_psql_env - args = ["-v", ON_ERROR_STOP_1, "-q", "-f", filename] + args = ["-v", ON_ERROR_STOP_1, "-q", "-X", "-f", filename] args.concat(Array(extra_flags)) if extra_flags args << configuration["database"] run_cmd("psql", args, "loading") |