Skip to content

Commit

Permalink
Revert "Make sure :environment task is executed before db:schema:load…
Browse files Browse the repository at this point in the history
… 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
jeremy committed Sep 19, 2012
1 parent 6cbec58 commit e04818d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions activerecord/lib/active_record/railties/databases.rake
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit e04818d

Please sign in to comment.