Permalink
Browse files

Merge pull request #11120 from awilliams/ar_mysql2_boolean_quoting

Fixes AR mysql2 adapter incorrectly casting boolean values
Conflicts:

	activerecord/CHANGELOG.md
  • Loading branch information...
1 parent c940b14 commit 5ac6fac1ad108e7f2a508da8b2fc090d43b2435f @senny senny committed Jul 16, 2013
View
22 activerecord/CHANGELOG.md
@@ -1,5 +1,27 @@
## unreleased ##
+* Fix bug when using Mysql2 adapter where in some cases, boolean values were
+ being output in sql as `t` or `f` instead of `1` or `0`. Example:
+
+ class Model < ActiveRecord::Base
+ validates_uniqueness_of :boolean_col
+ end
+ Model.first.valid?
+
+ Previously generated sql:
+
+ SELECT 1 AS one FROM `models` WHERE
+ `models`.`boolean_col` = BINARY 'f' LIMIT 1
+
+ With fix:
+
+ SELECT 1 AS one FROM `models` WHERE
+ `models`.`boolean_col` = BINARY 0 LIMIT 1
+
+ Fixes: #11119
+
+ *Adam Williams*
+
* `change_column` for PostgreSQL adapter respects the `:array` option.
*Yves Senn*
View
6 activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -263,6 +263,12 @@ def quoted_false
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:
View
6 activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -160,12 +160,6 @@ def error_number(exception) # :nodoc:
# 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
View
25 activerecord/test/cases/adapters/mysql2/quoting_test.rb
@@ -0,0 +1,25 @@
+require "cases/helper"
+
+module ActiveRecord
+ module ConnectionAdapters
+ class Mysql2Adapter
+ class QuotingTest < ActiveRecord::TestCase
+ def setup
+ @conn = ActiveRecord::Base.connection
+ end
+
+ def test_type_cast_true
+ c = Column.new(nil, 1, 'boolean')
+ assert_equal 1, @conn.type_cast(true, nil)
+ assert_equal 1, @conn.type_cast(true, c)
+ end
+
+ def test_type_cast_false
+ c = Column.new(nil, 1, 'boolean')
+ assert_equal 0, @conn.type_cast(false, nil)
+ assert_equal 0, @conn.type_cast(false, c)
+ end
+ end
+ end
+ end
+end

0 comments on commit 5ac6fac

Please sign in to comment.