diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-08-17 13:56:59 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-08-17 14:54:34 +0100 |
| commit | 25e5b0c4a8d0045715a6ad11e2898585826e4e9b (patch) | |
| tree | dad28e05c5b6fee48b32e025b880d5b3144d076f /activemodel/test | |
| parent | ff1b0d3c86c2b26470a30a5edb958a365f00098e (diff) | |
| download | rails-25e5b0c4a8d0045715a6ad11e2898585826e4e9b.tar.gz rails-25e5b0c4a8d0045715a6ad11e2898585826e4e9b.tar.bz2 rails-25e5b0c4a8d0045715a6ad11e2898585826e4e9b.zip | |
Remove support for SQLite 2.
If you're still using it, please install the plugin from git://github.com/rails/sqlite2_adapter.git
Diffstat (limited to 'activemodel/test')
| -rw-r--r-- | activemodel/test/cases/tests_database.rb | 13 |
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 |