diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2013-11-10 08:17:49 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2013-11-10 08:17:49 +0000 |
| commit | ccf55e65f002171af02ca09d2d878099e86481df (patch) | |
| tree | 65e702bf3379be71d4a1ca43b30e20eca3828524 /lib/tasks | |
| parent | 0707c7a12de82e2a6b3aa149a2c2415dd257ac14 (diff) | |
| download | redmine-ccf55e65f002171af02ca09d2d878099e86481df.tar.gz redmine-ccf55e65f002171af02ca09d2d878099e86481df.zip | |
ci.rake: use 'jdbcsqlite3' for JRuby
git-svn-id: http://svn.redmine.org/redmine/trunk@12258 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/ci.rake | 5 |
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' |