Skip to content
This repository
Browse code

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
  • Loading branch information...
commit 16e41c6b75210ae5d755255b558f72b3d6efc999 1 parent 6fbedf2
Marcel Molina authored
2  railties/CHANGELOG
... ... @@ -1,5 +1,7 @@
1 1 *SVN*
2 2
  3 +* Ignore version mismatch between pg_dump and the database server. #3457 [simon.stapleton@gmail.com]
  4 +
3 5 * Reap FCGI processes after lighttpd exits. [Sam Stephenson]
4 6
5 7 * Update to script.aculo.us to 1.5.0 rev. 3343 [Thomas Fuchs]
2  railties/lib/tasks/databases.rake
@@ -46,7 +46,7 @@ task :db_structure_dump => :environment do
46 46 ENV['PGPASSWORD'] = abcs[RAILS_ENV]["password"].to_s if abcs[RAILS_ENV]["password"]
47 47 search_path = abcs[RAILS_ENV]["schema_search_path"]
48 48 search_path = "--schema=#{search_path}" if search_path
49   - `pg_dump -U "#{abcs[RAILS_ENV]["username"]}" -s -x -O -f db/#{RAILS_ENV}_structure.sql #{search_path} #{abcs[RAILS_ENV]["database"]}`
  49 + `pg_dump -i -U "#{abcs[RAILS_ENV]["username"]}" -s -x -O -f db/#{RAILS_ENV}_structure.sql #{search_path} #{abcs[RAILS_ENV]["database"]}`
50 50 when "sqlite", "sqlite3"
51 51 dbfile = abcs[RAILS_ENV]["database"] || abcs[RAILS_ENV]["dbfile"]
52 52 `#{abcs[RAILS_ENV]["adapter"]} #{dbfile} .schema > db/#{RAILS_ENV}_structure.sql`

0 comments on commit 16e41c6

Please sign in to comment.
Something went wrong with that request. Please try again.