Merge pull request #3680 from rubys/master

This fix causes the AWDwR test to go back to being green on Rails master.

1 files changed, 2 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 589ed3bd11..abd71793fd 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/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