kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

git-svn-id: http://svn.redmine.org/redmine/trunk@12261 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-11-10 10:33:35 +00:00
parent ccf55e65f0
commit 6ccdee7713
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/tasks/ci.rake
View File

@ -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

8
lib/tasks/jdbc.rake
View File

@ -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