diff options
| author | Sam Ruby <rubys@intertwingly.net> | 2011-11-18 10:05:06 -0500 |
|---|---|---|
| committer | Sam Ruby <rubys@intertwingly.net> | 2011-11-18 10:05:06 -0500 |
| commit | 42954c426b2338bf90f286b8e425b2e192d483ae (patch) | |
| tree | cf3b77a3574a2cba7562b9cc630829bd846b721b /activerecord/lib/active_record/railties | |
| parent | 1c4564b6207c9b5db7a4ed46bec45561bf49a129 (diff) | |
| download | rails-42954c426b2338bf90f286b8e425b2e192d483ae.tar.gz rails-42954c426b2338bf90f286b8e425b2e192d483ae.tar.bz2 rails-42954c426b2338bf90f286b8e425b2e192d483ae.zip | |
Stop db:seed from performing a reload of the db
Fix regression introduced by 38d26b0cb56d82093889efa95992a35ba3bb9f29
Diffstat (limited to 'activerecord/lib/active_record/railties')
| -rw-r--r-- | activerecord/lib/active_record/railties/databases.rake | 4 |
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 |