Merge pull request rails#2744 from arunagw/mysql2_bump

Mysql2 bump
mejibyte · Aug 30, 2011 · 0195846 · 0195846
2 parents d7d0c25 + 941a9d0
commit 0195846
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -41,7 +41,7 @@ platforms :ruby do
   group :db do
     gem "pg", ">= 0.9.0" unless ENV['TRAVIS'] # once pg is on travis this can be removed
     gem "mysql", ">= 2.8.1"
-    gem "mysql2", "~> 0.2.11"
+    gem "mysql2", "~> 0.2.13"
   end
 end
 

diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb
@@ -425,7 +425,7 @@ def convert_database_option_for_jruby
 
       def version_constraint_for_database_gem
         case options[:database]
-        when "mysql"      then "~> 0.2.11"
+        when "mysql"      then "~> 0.2.13"
         else nil
         end
       end

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
@@ -167,7 +167,7 @@ def test_config_another_database
     unless defined?(JRUBY_VERSION)
       # Ensure that the mysql2 gem is listed with a compatible version of the
       # mysql2 gem
-      assert_file "Gemfile", /^gem\s+["']mysql2["'],\s*'~> 0.2.11'$/
+      assert_file "Gemfile", /^gem\s+["']mysql2["'],\s*'~> 0.2.13'$/
     else
       assert_file "Gemfile", /^gem\s+["']activerecord-jdbcmysql-adapter["']$/
     end