Distinguish mysql/mysql2 adapters in Gemfile (#13270).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11494 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index 5da32e43cd0c747b384ab929c815cbe077aaaa4c..5ecc41fc1e9d1024c39a009213838cbb0c06ac22 100644 (file)
--- 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]