From a2ce1de14e5f7b8b535e21cc89f31fc6851d96c8 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Mon, 24 Dec 2012 12:23:39 +0900
Subject: [PATCH] we're not supporting SQLite 2

---
 actionpack/test/active_record_unit.rb | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/actionpack/test/active_record_unit.rb b/actionpack/test/active_record_unit.rb
index 4dd74067984a1..95fbb112c0a31 100644
--- a/actionpack/test/active_record_unit.rb
+++ b/actionpack/test/active_record_unit.rb
@@ -45,19 +45,11 @@ def setup
       def setup_connection
         if Object.const_defined?(:ActiveRecord)
           defaults = { :database => ':memory:' }
-          begin
-            adapter = defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'
-            options = defaults.merge :adapter => adapter, :timeout => 500
-            ActiveRecord::Base.establish_connection(options)
-            ActiveRecord::Base.configurations = { 'sqlite3_ar_integration' => options }
-            ActiveRecord::Base.connection
-          rescue Exception  # errors from establishing a connection
-            $stderr.puts 'SQLite 3 unavailable; trying SQLite 2.'
-            options = defaults.merge :adapter => 'sqlite'
-            ActiveRecord::Base.establish_connection(options)
-            ActiveRecord::Base.configurations = { 'sqlite2_ar_integration' => options }
-            ActiveRecord::Base.connection
-          end
+          adapter = defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'
+          options = defaults.merge :adapter => adapter, :timeout => 500
+          ActiveRecord::Base.establish_connection(options)
+          ActiveRecord::Base.configurations = { 'sqlite3_ar_integration' => options }
+          ActiveRecord::Base.connection
 
           Object.send(:const_set, :QUOTED_TYPE, ActiveRecord::Base.connection.quote_column_name('type')) unless Object.const_defined?(:QUOTED_TYPE)
         else