mysql type cast should return integers when typecasting true / false

3 files changed, 57 insertions, 0 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index 085357678c..c2e75acb9a 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -244,6 +244,12 @@ module ActiveRecord
         end
       end
 
+      def type_cast(value, column)
+        return super unless value == true || value == false
+
+        value ? 1 : 0
+      end
+
       def quote_column_name(name) #:nodoc:
         @quoted_column_names[name] ||= "`#{name}`"
       end
diff --git a/activerecord/test/cases/adapters/mysql/quoting_test.rb b/activerecord/test/cases/adapters/mysql/quoting_test.rb
new file mode 100644
index 0000000000..9673e2bb46
--- /dev/null
+++ b/activerecord/test/cases/adapters/mysql/quoting_test.rb
@@ -0,0 +1,26 @@
+require "cases/helper"
+
+module ActiveRecord
+  module ConnectionAdapters
+    class MysqlAdapter
+      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
+
diff --git a/activerecord/test/cases/adapters/postgresql/quoting_test.rb b/activerecord/test/cases/adapters/postgresql/quoting_test.rb
new file mode 100644
index 0000000000..172055f15c
--- /dev/null
+++ b/activerecord/test/cases/adapters/postgresql/quoting_test.rb
@@ -0,0 +1,25 @@
+require "cases/helper"
+
+module ActiveRecord
+  module ConnectionAdapters
+    class PostgreSQLAdapter
+      class QuotingTest < ActiveRecord::TestCase
+        def setup
+          @conn = ActiveRecord::Base.connection
+        end
+
+        def test_type_cast_true
+          c = Column.new(nil, 1, 'boolean')
+          assert_equal 't', @conn.type_cast(true, nil)
+          assert_equal 't', @conn.type_cast(true, c)
+        end
+
+        def test_type_cast_false
+          c = Column.new(nil, 1, 'boolean')
+          assert_equal 'f', @conn.type_cast(false, nil)
+          assert_equal 'f', @conn.type_cast(false, c)
+        end
+      end
+    end
+  end
+end