From 20cd146e93cd4589117fbd388bdbc95daf3cc903 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 9 Mar 2013 11:07:55 +0000 Subject: [PATCH] Backported r11494 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11577 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 8a30e19a0..5ecc41fc1 100644 --- a/Gemfile +++ b/Gemfile @@ -45,9 +45,11 @@ if File.exist?(database_file) if adapters.any? adapters.each do |adapter| case adapter - when /mysql/ - gem "mysql", "~> 2.8.1", :platforms => [:mri_18, :mingw_18] - gem "mysql2", "~> 0.3.11", :platforms => [:mri_19, :mingw_19] + when 'mysql2' + gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw] + gem "activerecord-jdbcmysql-adapter", :platforms => :jruby + when 'mysql' + gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw] gem "activerecord-jdbcmysql-adapter", :platforms => :jruby when /postgresql/ gem "pg", ">= 0.11.0", :platforms => [:mri, :mingw]