diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-11-10 10:33:35 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-11-10 10:33:35 +0000 |
| commit | 6ccdee7713c482e1170355ccd2fce9508732a739 (patch) | |
| tree | 5230c173d4fa99dc9fc82c213aea1af0a3414030 /lib | |
| parent | ccf55e65f002171af02ca09d2d878099e86481df (diff) | |
| download | redmine-6ccdee7713c482e1170355ccd2fce9508732a739.tar.gz redmine-6ccdee7713c482e1170355ccd2fce9508732a739.zip | |
Fixed that rake db:create fails with JRuby (#15218).
git-svn-id: http://svn.redmine.org/redmine/trunk@12261 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tasks/ci.rake | 5 | ||||
| -rw-r--r-- | lib/tasks/jdbc.rake | 8 |
2 files changed, 1 insertions, 12 deletions
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake index 1a0157440..d30e9fb0a 100644 --- 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 index 289b3d94c..000000000 --- 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 |