Skip to content
Browse files

Merge pull request #3680 from rubys/master

This fix causes the AWDwR test to go back to being green on Rails master.
  • Loading branch information...
2 parents 1c4564b + 42954c4 commit d4119e144a67e19cdf5d742caaf7d7647ebcb633 @jonleighton jonleighton committed Nov 18, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 activerecord/lib/active_record/railties/databases.rake
View
4 activerecord/lib/active_record/railties/databases.rake
@@ -295,10 +295,10 @@ db_namespace = namespace :db do
end
desc 'Create the database, load the schema, and initialize with the seed data (use db:reset to also drop the db first)'
- task :setup => :seed
+ task :setup => ['db:schema:load_if_ruby', 'db:structure:load_if_sql', :seed]
desc 'Load the seed data from db/seeds.rb'
- task :seed => ['db:schema:load_if_ruby', 'db:structure:load_if_sql'] do
+ task :seed do
db_namespace['abort_if_pending_migrations'].invoke
Rails.application.load_seed
end

0 comments on commit d4119e1

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