diff options
| author | Marcel Molina <marcel@vernix.org> | 2006-01-13 01:29:28 +0000 |
|---|---|---|
| committer | Marcel Molina <marcel@vernix.org> | 2006-01-13 01:29:28 +0000 |
| commit | 16e41c6b75210ae5d755255b558f72b3d6efc999 (patch) | |
| tree | 15a548973dc4f82c0750d35580a66df23ccac56f /railties | |
| parent | 6fbedf2e31dae954a07128d8133f8385cfb64301 (diff) | |
| download | rails-16e41c6b75210ae5d755255b558f72b3d6efc999.tar.gz rails-16e41c6b75210ae5d755255b558f72b3d6efc999.tar.bz2 rails-16e41c6b75210ae5d755255b558f72b3d6efc999.zip | |
Ignore version mismatch between pg_dump and the database server. Closes #3457.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3400 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/tasks/databases.rake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 9c5073ae1f..9532671d84 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Ignore version mismatch between pg_dump and the database server. #3457 [simon.stapleton@gmail.com] + * Reap FCGI processes after lighttpd exits. [Sam Stephenson] * Update to script.aculo.us to 1.5.0 rev. 3343 [Thomas Fuchs] diff --git a/railties/lib/tasks/databases.rake b/railties/lib/tasks/databases.rake index 1768f0a41a..971f9ae461 100644 --- a/railties/lib/tasks/databases.rake +++ b/railties/lib/tasks/databases.rake @@ -46,7 +46,7 @@ task :db_structure_dump => :environment do ENV['PGPASSWORD'] = abcs[RAILS_ENV]["password"].to_s if abcs[RAILS_ENV]["password"] search_path = abcs[RAILS_ENV]["schema_search_path"] search_path = "--schema=#{search_path}" if search_path - `pg_dump -U "#{abcs[RAILS_ENV]["username"]}" -s -x -O -f db/#{RAILS_ENV}_structure.sql #{search_path} #{abcs[RAILS_ENV]["database"]}` + `pg_dump -i -U "#{abcs[RAILS_ENV]["username"]}" -s -x -O -f db/#{RAILS_ENV}_structure.sql #{search_path} #{abcs[RAILS_ENV]["database"]}` when "sqlite", "sqlite3" dbfile = abcs[RAILS_ENV]["database"] || abcs[RAILS_ENV]["dbfile"] `#{abcs[RAILS_ENV]["adapter"]} #{dbfile} .schema > db/#{RAILS_ENV}_structure.sql` |