From c212cfecb177338db21d2ecebbb66aa0787974f4 Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Wed, 17 Jul 2013 09:51:22 +0200 Subject: Revert "Merge pull request #11120 from awilliams/ar_mysql2_boolean_quoting" This reverts commit cb1d07e43926bcec95cb8b4a663ca9889173395a, reversing changes made to 754a373e301d2df0b12a11083405252722bc8366. --- .../lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 6 ------ activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index be42d7e3c6..5b25b26164 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -272,12 +272,6 @@ module ActiveRecord QUOTED_FALSE end - def type_cast(value, column) - return super unless value == true || value == false - - value ? 1 : 0 - end - # REFERENTIAL INTEGRITY ==================================== def disable_referential_integrity(&block) #:nodoc: diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index be0eb64efd..1826d88500 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -160,6 +160,12 @@ module ActiveRecord # QUOTING ================================================== + def type_cast(value, column) + return super unless value == true || value == false + + value ? 1 : 0 + end + def quote_string(string) #:nodoc: @connection.quote(string) end -- cgit v1.2.3