aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/active_record_store_test.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/test/controller/active_record_store_test.rb b/actionpack/test/controller/active_record_store_test.rb
index 618995a3f2..a17a4916e3 100644
--- a/actionpack/test/controller/active_record_store_test.rb
+++ b/actionpack/test/controller/active_record_store_test.rb
@@ -14,7 +14,13 @@ require File.dirname(__FILE__) + '/../abstract_unit'
require 'action_controller/session/active_record_store'
#ActiveRecord::Base.logger = Logger.new($stdout)
-CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:')
+begin
+ CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:')
+ CGI::Session::ActiveRecordStore::Session.connection
+rescue Object
+ $stderr.puts 'SQLite 3 unavailable; falling to SQLite 2.'
+ CGI::Session::ActiveRecordStore::Session.establish_connection(:adapter => 'sqlite', :dbfile => ':memory:')
+end
class ActiveRecordStoreTest < Test::Unit::TestCase