Merge pull request #7140 from seamusabshere/patch-1

Make sure :environment task is executed before db:schema:load or
db:structure:load

Conflicts:
	activerecord/CHANGELOG.md

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 79032fe4df..83d9126ccb 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 => 'db:create' do
+    task :load_if_ruby => [:environment, 'db:create'] 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 => 'db:create' do
+    task :load_if_sql => [:environment, 'db:create'] do
       db_namespace["structure:load"].invoke if ActiveRecord::Base.schema_format == :sql
     end
   end