diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-09-19 12:08:19 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-19 21:54:04 -0300 |
commit | c41f9c1bd5346753dacd1caaf1fd69e09f975c90 (patch) | |
tree | 4a889fbe077acb18ea76e6a91a2a23f7076c731b | |
parent | 61d5d2d8a97fd289b81991cd79dca3112e7ca135 (diff) | |
download | rails-c41f9c1bd5346753dacd1caaf1fd69e09f975c90.tar.gz rails-c41f9c1bd5346753dacd1caaf1fd69e09f975c90.tar.bz2 rails-c41f9c1bd5346753dacd1caaf1fd69e09f975c90.zip |
Load the environment after creating the database
Conflicts:
activerecord/lib/active_record/railties/databases.rake
-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 aabd0d0bdb..6d43b232ad 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -369,7 +369,7 @@ db_namespace = namespace :db do end end - task :load_if_ruby => [:environment, 'db:create'] do + task :load_if_ruby => ['db:create', :environment] do db_namespace["schema:load"].invoke if ActiveRecord::Base.schema_format == :ruby end end @@ -445,7 +445,7 @@ db_namespace = namespace :db do end end - task :load_if_sql => [:environment, 'db:create'] do + task :load_if_sql => ['db:create', :environment] do db_namespace["structure:load"].invoke if ActiveRecord::Base.schema_format == :sql end end |