diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-07-17 09:51:22 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-07-17 09:51:22 +0200 |
| commit | c212cfecb177338db21d2ecebbb66aa0787974f4 (patch) | |
| tree | 05b9cf017096721f5f6980c8dbf192efceea4d13 /activerecord/lib | |
| parent | 6356d42093b10866f18d7bb21c442f1ccbd3c96c (diff) | |
| download | rails-c212cfecb177338db21d2ecebbb66aa0787974f4.tar.gz rails-c212cfecb177338db21d2ecebbb66aa0787974f4.tar.bz2 rails-c212cfecb177338db21d2ecebbb66aa0787974f4.zip | |
Revert "Merge pull request #11120 from awilliams/ar_mysql2_boolean_quoting"
This reverts commit cb1d07e43926bcec95cb8b4a663ca9889173395a, reversing
changes made to 754a373e301d2df0b12a11083405252722bc8366.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 6 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 6 |
2 files changed, 6 insertions, 6 deletions
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 |