Stop db:seed from performing a reload of the db

Fix regression introduced by 38d26b0
rails · Nov 18, 2011 · 42954c4 · 42954c4
1 parent 1c4564b
commit 42954c4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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