aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-09-19 12:06:24 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-09-19 12:06:24 -0700
commite04818d1b8de44d47003031791f142182320ed89 (patch)
tree3f56c6c53f914a2ed882e32a8a3438be619f8f17 /activerecord/lib/active_record
parent6cbec586731b7c5f293f2a7b6c7330c7181acdfe (diff)
downloadrails-e04818d1b8de44d47003031791f142182320ed89.tar.gz
rails-e04818d1b8de44d47003031791f142182320ed89.tar.bz2
rails-e04818d1b8de44d47003031791f142182320ed89.zip
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 5ca11fefce6d83f5db399aa4412f1f1a0d42b2e6.
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/railties/databases.rake4
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 bcb26f72c8..30b85f8c8f 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/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