diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-02-06 13:27:50 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-02-06 13:27:50 -0800 |
| commit | a5c98bb0635ac600a657d3fc8608dbdf4f9174e9 (patch) | |
| tree | 13cf6ef8c5e37d2bf02150cb271bbcf63313dbe7 /actionpack/test | |
| parent | 9c2918d9749d8aa6071f7aa5aa2500a314e5bafb (diff) | |
| download | rails-a5c98bb0635ac600a657d3fc8608dbdf4f9174e9.tar.gz rails-a5c98bb0635ac600a657d3fc8608dbdf4f9174e9.tar.bz2 rails-a5c98bb0635ac600a657d3fc8608dbdf4f9174e9.zip | |
Test AR integration with jdbcsqlite3 adapter on jruby
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/active_record_unit.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/test/active_record_unit.rb b/actionpack/test/active_record_unit.rb index d8d2e00dc2..9e0c66055d 100644 --- a/actionpack/test/active_record_unit.rb +++ b/actionpack/test/active_record_unit.rb @@ -51,7 +51,8 @@ class ActiveRecordTestConnector if Object.const_defined?(:ActiveRecord) defaults = { :database => ':memory:' } begin - options = defaults.merge :adapter => 'sqlite3', :timeout => 500 + 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 |