Merge pull request rails#1724 from brianmario/lazy-mysql2-casting

re-enable eager-casting for mysql2
flyerhzm · Jun 16, 2011 · 014008d · 014008d
2 parents a7039df + d2b1340
commit 014008d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -55,7 +55,7 @@ platforms :ruby do
   group :db do
     gem "pg", ">= 0.11.0"
     gem "mysql", ">= 2.8.1"
-    gem "mysql2", ">= 0.3.3"
+    gem "mysql2", ">= 0.3.4"
   end
 end
 

diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-gem 'mysql2', '~> 0.3.3'
+gem 'mysql2', '~> 0.3.4'
 require 'mysql2'
 
 module ActiveRecord
@@ -629,7 +629,7 @@ def connect
         end
 
         def configure_connection
-          @connection.query_options.merge!(:as => :array, :cast => false)
+          @connection.query_options.merge!(:as => :array)
 
           # By default, MySQL 'where id is null' selects the last inserted id.
           # Turn this off. http://dev.rubyonrails.org/ticket/6778