Skip to content

Commit 014008d

Browse files
committed
Merge pull request rails#1724 from brianmario/lazy-mysql2-casting
re-enable eager-casting for mysql2
2 parents a7039df + d2b1340 commit 014008d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ platforms :ruby do
5555
group :db do
5656
gem "pg", ">= 0.11.0"
5757
gem "mysql", ">= 2.8.1"
58-
gem "mysql2", ">= 0.3.3"
58+
gem "mysql2", ">= 0.3.4"
5959
end
6060
end
6161

activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# encoding: utf-8
22

3-
gem 'mysql2', '~> 0.3.3'
3+
gem 'mysql2', '~> 0.3.4'
44
require 'mysql2'
55

66
module ActiveRecord
@@ -629,7 +629,7 @@ def connect
629629
end
630630

631631
def configure_connection
632-
@connection.query_options.merge!(:as => :array, :cast => false)
632+
@connection.query_options.merge!(:as => :array)
633633

634634
# By default, MySQL 'where id is null' selects the last inserted id.
635635
# Turn this off. http://dev.rubyonrails.org/ticket/6778

0 commit comments

Comments
 (0)