work around "rake db:create:all" error on JRuby SQLite3

<pre>
$ bundle exec rake ci --trace
...
rake aborted!
stack level too deep
/home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:184:in `local_database?'
/home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:52:in `(root)'
org/jruby/RubyHash.java:1375:in `each_value'
/home/xxxx/.rvm/gems/jruby-1.7.4/gems/activerecord-3.2.15/lib/active_record/railties/databases.rake:38:in `(root)'
</pre>

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

diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake
index df629956072ff7e57eebc9d2d1c7b19e94f9e3b2..ab7eb23415b39eb65975fe13d25b0308007e608e 100644 (file)
--- a/lib/tasks/ci.rake
+++ b/lib/tasks/ci.rake
@@ -13,7 +13,10 @@ namespace :ci do
   task :setup do
     Rake::Task["tmp:clear"].invoke
     Rake::Task["log:clear"].invoke
-    Rake::Task["db:create:all"].invoke
+    database = ENV['DATABASE_ADAPTER']
+    unless Object.const_defined?(:JRUBY_VERSION) && database =~ /sqlite3/
+      Rake::Task["db:create:all"].invoke
+    end
     Rake::Task["db:migrate"].invoke
     Rake::Task["db:schema:dump"].invoke
     Rake::Task["test:scm:setup:all"].invoke