Permalink
Browse files

Merge pull request #5493 from kennyj/fix_5435-32

[3-2-stable] Fix GH #5435. db:structure:dump should be re-enable.
  • Loading branch information...
2 parents 41815f5 + f4f9ec1 commit d9355bea0447e640de638e0a86b557e0d1a0425b @drogus drogus committed Mar 18, 2012
Showing with 13 additions and 0 deletions.
  1. +1 −0 activerecord/lib/active_record/railties/databases.rake
  2. +12 −0 railties/test/application/rake_test.rb
@@ -407,6 +407,7 @@ db_namespace = namespace :db do
if ActiveRecord::Base.connection.supports_migrations?
File.open(filename, "a") { |f| f << ActiveRecord::Base.connection.dump_schema_information }
end
+ db_namespace['structure:dump'].reenable
end
# desc "Recreate the databases from the structure.sql file"
@@ -138,5 +138,17 @@ def test_rake_dump_structure_should_respect_db_structure_env_variable
end
assert File.exists?(File.join(app_path, 'db', 'my_structure.sql'))
end
+
+ def test_rake_dump_structure_should_be_called_twice_when_migrate_redo
+ add_to_config "config.active_record.schema_format = :sql"
+
+ output = Dir.chdir(app_path) do
+ `rails g model post title:string;
+ bundle exec rake db:migrate:redo 2>&1 --trace;`
+ end
+
+ # expect only Invoke db:structure:dump (first_time)
+ assert_no_match(/^\*\* Invoke db:structure:dump\s+$/, output)
+ end
end
end

0 comments on commit d9355be

Please sign in to comment.