diff --git a/Gemfile b/Gemfile index 03c748e3af..08482084ea 100644 --- 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.0" + gem "mysql2", ">= 0.3.3" end end diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb index ac2da73a84..5c45f233f9 100644 --- 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.0' +gem 'mysql2', '~> 0.3.3' require 'mysql2' module ActiveRecord @@ -629,7 +629,7 @@ module ActiveRecord end def configure_connection - @connection.query_options.merge!(:as => :array) + @connection.query_options.merge!(:as => :array, :cast => false) # By default, MySQL 'where id is null' selects the last inserted id. # Turn this off. http://dev.rubyonrails.org/ticket/6778