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

git-svn-id: http://svn.redmine.org/redmine/trunk@12261 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index 1a0157440ba48c69fe9642798020423847da9a24..d30e9fb0a73ddd7b2c2453aefed59465bcff31e6 100644 (file)
--- 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
deleted file mode 100644 (file)
index 289b3d9..0000000
--- a/lib/tasks/jdbc.rake
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file was generated by the "jdbc" generator, which is provided
-# by the activerecord-jdbc-adapter gem.
-#
-# This file allows you to use Rails' various db:* tasks with JDBC.
-if defined?(JRUBY_VERSION)
-  require 'jdbc_adapter'
-  require 'jdbc_adapter/rake_tasks'
-end