summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/tasks/ci.rake5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index 0834d874d..1a0157440 100644
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -55,8 +55,9 @@ file 'config/database.yml' do
'host' => 'localhost',
'username' => 'jenkins', 'password' => 'jenkins'}
test_conf = dev_conf.merge('database' => test_db_name)
- when 'sqlite3'
- dev_conf = {'adapter' => 'sqlite3',
+ when /sqlite3/
+ dev_conf = {'adapter' => (Object.const_defined?(:JRUBY_VERSION) ?
+ 'jdbcsqlite3' : 'sqlite3'),
'database' => "db/#{dev_db_name}.sqlite3"}
test_conf = dev_conf.merge('database' => "db/#{test_db_name}.sqlite3")
when 'sqlserver'