Browse files

Test AR integration with jdbcsqlite3 adapter on jruby

  • Loading branch information...
1 parent 9c2918d commit a5c98bb0635ac600a657d3fc8608dbdf4f9174e9 @jeremy jeremy committed Feb 6, 2009
Showing with 2 additions and 1 deletion.
  1. +2 −1 actionpack/test/active_record_unit.rb
View
3 actionpack/test/active_record_unit.rb
@@ -51,7 +51,8 @@ def setup_connection
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

0 comments on commit a5c98bb

Please sign in to comment.