Fixed that rake db:create fails with JRuby (#15218).

git-svn-id: http://svn.redmine.org/redmine/trunk@12261 e93f8b46-1217-0410-a6f0-8f06a7374b81
chrwhm · Nov 10, 2013 · 6ccdee7 · 6ccdee7
1 parent ccf55e6
commit 6ccdee7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
@@ -13,10 +13,7 @@ namespace :ci do
   task :setup do
     Rake::Task["tmp:clear"].invoke
     Rake::Task["log:clear"].invoke
-    database = ENV['DATABASE_ADAPTER']
-    unless Object.const_defined?(:JRUBY_VERSION) && database =~ /sqlite3/
-      Rake::Task["db:create:all"].invoke
-    end
+    Rake::Task["db:create:all"].invoke
     Rake::Task["db:migrate"].invoke
     Rake::Task["db:schema:dump"].invoke
     Rake::Task["test:scm:setup:all"].invoke

diff --git a/lib/tasks/jdbc.rake b/lib/tasks/jdbc.rake