Permalink
Browse files

Fix GH #5435. db:structure:dump should be reenable.

  • Loading branch information...
1 parent 9256372 commit 0360b3eb1f64128cfaa6c4eeb20e624f51e41ecf @kennyj kennyj committed Mar 17, 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
@@ -426,6 +426,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"
@@ -140,6 +140,18 @@ def test_rake_dump_structure_should_respect_db_structure_env_variable
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
+
def test_rake_dump_schema_cache
Dir.chdir(app_path) do
`rails generate model post title:string;

0 comments on commit 0360b3e

Please sign in to comment.