From 74389ddbd5047c1d2fc9bb3cc85bc2f30bf59cf0 Mon Sep 17 00:00:00 2001 From: Lachlan Laycock Date: Sat, 30 May 2009 05:14:27 +0800 Subject: [PATCH] Made test tasks respect RAILS_ENV Signed-off-by: Raimonds Simanovskis --- .../connection_adapters/oracle_enhanced.rake | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/active_record/connection_adapters/oracle_enhanced.rake b/lib/active_record/connection_adapters/oracle_enhanced.rake index e79256e21..1629252b7 100644 --- a/lib/active_record/connection_adapters/oracle_enhanced.rake +++ b/lib/active_record/connection_adapters/oracle_enhanced.rake @@ -24,17 +24,19 @@ namespace :db do end namespace :test do - redefine_task :clone_structure => [ "db:structure:dump", "db:test:purge" ] do + redefine_task :clone_structure => [ :rails_env, "db:structure:dump", "db:test:purge" ] do + env = RAILS_ENV ||= 'test' abcs = ActiveRecord::Base.configurations - ActiveRecord::Base.establish_connection(:test) + ActiveRecord::Base.establish_connection(env.to_sym) IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split("\n\n").each do |ddl| ActiveRecord::Base.connection.execute(ddl.chop) end end - redefine_task :purge => :environment do + redefine_task :purge => [:rails_env, :environment] do + env = RAILS_ENV ||= 'test' abcs = ActiveRecord::Base.configurations - ActiveRecord::Base.establish_connection(:test) + ActiveRecord::Base.establish_connection(env.to_sym) ActiveRecord::Base.connection.structure_drop.split("\n\n").each do |ddl| ActiveRecord::Base.connection.execute(ddl.chop) end