From 953b3619d49b4b1feb07e9714e6ebe4b1b961045 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Thu, 28 Feb 2013 17:20:28 +0000 Subject: [PATCH] Distinguish mysql/mysql2 adapters in Gemfile (#13270). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11494 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- Gemfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 5da32e43c..5ecc41fc1 100644 --- a/Gemfile +++ b/Gemfile @@ -45,10 +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] - mysql2_platforms = RUBY_VERSION >= '2.0' ? [:mri_20, :mingw_20] : [:mri_19, :mingw_19] - gem "mysql2", "~> 0.3.11", :platforms => mysql2_platforms + 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]