Skip to content
Browse files

Revert "Make sure :environment task is executed before db:schema:load…

… or db:structure:load
"

Breaks db:setup because it tries to load the environment before creating the database.

This reverts commit 5ca11fe.
  • Loading branch information...
1 parent 6cbec58 commit e04818d1b8de44d47003031791f142182320ed89 @jeremy jeremy committed Sep 19, 2012
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
@@ -245,7 +245,7 @@ db_namespace = namespace :db do
end
end
- task :load_if_ruby => [:environment, 'db:create'] do
+ task :load_if_ruby => 'db:create' do
db_namespace["schema:load"].invoke if ActiveRecord::Base.schema_format == :ruby
end
@@ -328,7 +328,7 @@ db_namespace = namespace :db do
end
end
- task :load_if_sql => [:environment, 'db:create'] do
+ task :load_if_sql => 'db:create' do
db_namespace["structure:load"].invoke if ActiveRecord::Base.schema_format == :sql
end
end

0 comments on commit e04818d

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