aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-11-30 16:04:50 +0100
committerYves Senn <yves.senn@gmail.com>2015-11-30 16:06:57 +0100
commitf746534ca4654112453a7e4904acaed148314764 (patch)
treefcfb05de3d57ef9cb1853b465110ac4676d75a55 /activerecord/lib/active_record
parent8299a35d25a68dd9216a0cc6bb719c8aafa2b300 (diff)
parentd1dcdf21286cb459a422b6b88967d712c75f002a (diff)
downloadrails-f746534ca4654112453a7e4904acaed148314764.tar.gz
rails-f746534ca4654112453a7e4904acaed148314764.tar.bz2
rails-f746534ca4654112453a7e4904acaed148314764.zip
Merge pull request #22345 from GUI/fix-multi-schema-structure-dump
Fix rake db:structure:dump on Postgres when multiple schemas are used Conflicts: activerecord/CHANGELOG.md Closes #22346.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/tasks/postgresql_database_tasks.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb b/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
index cd7d949239..8b4874044c 100644
--- a/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
+++ b/activerecord/lib/active_record/tasks/postgresql_database_tasks.rb
@@ -56,9 +56,9 @@ module ActiveRecord
args = ['-s', '-x', '-O', '-f', filename]
unless search_path.blank?
- args << search_path.split(',').map do |part|
+ args += search_path.split(',').map do |part|
"--schema=#{part.strip}"
- end.join(' ')
+ end
end
args << configuration['database']
run_cmd('pg_dump', args, 'dumping')