kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #3680 from rubys/master

Browse source 
This fix causes the AWDwR test to go back to being green on Rails master.
This commit is contained in:
Jon Leighton 2011-11-18 07:21:57 -08:00
commit d4119e144a
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activerecord/lib/active_record/railties/databases.rake
View file

@ -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