]> source.dussan.org Git - redmine.git/commitdiff
ci.rake: use 'jdbcsqlite3' for JRuby
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sun, 10 Nov 2013 08:17:49 +0000 (08:17 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sun, 10 Nov 2013 08:17:49 +0000 (08:17 +0000)
git-svn-id: http://svn.redmine.org/redmine/trunk@12258 e93f8b46-1217-0410-a6f0-8f06a7374b81

lib/tasks/ci.rake

index 0834d874d3ecab75df9721e7e01ecc20bf27f4b8..1a0157440ba48c69fe9642798020423847da9a24 100644 (file)
@@ -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'