Permalink
Browse files

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...
1 parent 6fbedf2 commit 16e41c6b75210ae5d755255b558f72b3d6efc999 Marcel Molina committed Jan 13, 2006
Showing with 3 additions and 1 deletion.
  1. +2 −0 railties/CHANGELOG
  2. +1 −1 railties/lib/tasks/databases.rake
View
@@ -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]
@@ -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`

0 comments on commit 16e41c6

Please sign in to comment.