Remove support for SQLite 2.

If you're still using it, please install the plugin from git://github.com/rails/sqlite2_adapter.git

1 files changed, 4 insertions, 9 deletions

diff --git a/activemodel/test/cases/tests_database.rb b/activemodel/test/cases/tests_database.rb
index 0f4475fa2d..8dd00ea147 100644
--- a/activemodel/test/cases/tests_database.rb
+++ b/activemodel/test/cases/tests_database.rb
@@ -27,15 +27,10 @@ module ActiveModel
 
     def self.setup_connection
       defaults = { :database => ':memory:' }
-      begin
-        adapter = defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'
-        options = defaults.merge :adapter => adapter, :timeout => 500
-        ActiveRecord::Base.establish_connection(options)
-      rescue Exception
-        $stderr.puts 'SQLite 3 unavailable; trying SQLite 2.'
-        options = defaults.merge :adapter => 'sqlite'
-        ActiveRecord::Base.establish_connection(options)
-      end
+
+      adapter = defined?(JRUBY_VERSION) ? 'jdbcsqlite3' : 'sqlite3'
+      options = defaults.merge :adapter => adapter, :timeout => 500
+      ActiveRecord::Base.establish_connection(options)
     end
   end
 end