From b3a806b7b2179fc588465fee728fe837cf8d4940 Mon Sep 17 00:00:00 2001 From: Arthur Neves Date: Fri, 13 Dec 2013 16:04:46 -0500 Subject: db:test:clone and prepare must load environment db:test:clone and db:test:prepare use ActiveRecord::Base. configurations, so we need to load the rails environment, otherwise the config wont be in place. --- activerecord/CHANGELOG.md | 7 +++++++ activerecord/lib/active_record/railties/databases.rake | 5 ++--- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'activerecord') diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 4845150a24..5dc369ebf1 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,10 @@ +* db:test:clone and db:test:prepare must load Rails environment + + db:test:clone and db:test:prepare use ActiveRecord::Base. configurations, + so we need to load the rails environment, otherwise the config wont be in place. + + *arthurnn* + * Create a whitelist of delegable methods to `Array`. Currently `Relation` directly delegates methods to `Array`. With this change, diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake index 52b3d3e5e6..0fdfed991c 100644 --- a/activerecord/lib/active_record/railties/databases.rake +++ b/activerecord/lib/active_record/railties/databases.rake @@ -343,7 +343,7 @@ db_namespace = namespace :db do end # desc "Recreate the test database from a fresh schema" - task :clone do + task :clone => :environment do case ActiveRecord::Base.schema_format when :ruby db_namespace["test:clone_schema"].invoke @@ -364,7 +364,7 @@ db_namespace = namespace :db do end # desc 'Check for pending migrations and load the test schema' - task :prepare => :load_config do + task :prepare => [:environment, :load_config] do unless ActiveRecord::Base.configurations.blank? db_namespace['test:load'].invoke end @@ -401,4 +401,3 @@ namespace :railties do end task 'test:prepare' => ['db:test:prepare', 'db:test:load', 'db:abort_if_pending_migrations'] - -- cgit v1.2.3