From 9ac5d9ff726b54a15c59a3af5604d1e19d9bb038 Mon Sep 17 00:00:00 2001 From: lukemelia Date: Tue, 11 Dec 2007 04:40:17 +0000 Subject: [PATCH] Updated to latest memory_test_fix plugin git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@684 a4c988fc-2ded-0310-b66e-134b36920a42 --- .../vendor/plugins/memory_test_fix/lib/memory_test_fix.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tracks/vendor/plugins/memory_test_fix/lib/memory_test_fix.rb b/tracks/vendor/plugins/memory_test_fix/lib/memory_test_fix.rb index 05e17b8c..d9313d11 100644 --- a/tracks/vendor/plugins/memory_test_fix/lib/memory_test_fix.rb +++ b/tracks/vendor/plugins/memory_test_fix/lib/memory_test_fix.rb @@ -1,8 +1,10 @@ -# Update: Looks for the SQLite and SQLite3 adapters for +# Update: Looks for the SQLite and SQLite3 adapters for # compatibility with Rails 1.2.2 and also older versions. def in_memory_database? - if ENV["RAILS_ENV"] == "test" and Rails::Configuration.new.database_configuration['test']['database'] == ':memory:' + if ENV["RAILS_ENV"] == "test" and + (Rails::Configuration.new.database_configuration['test']['database'] == ':memory:' or + Rails::Configuration.new.database_configuration['test']['dbfile'] == ':memory:') begin if ActiveRecord::Base.connection.class == ActiveRecord::ConnectionAdapters::SQLite3Adapter return true