2 files changed, 27 insertions, 5 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 5f512758e9..26015528e5 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -648,6 +648,8 @@ module ActiveRecord
       def initialize_type_map(m) # :nodoc:
         super
 
+        register_class_with_limit m, %r(char)i, MysqlString
+
         m.register_type %r(tinytext)i,   Type::Text.new(limit: 2**8 - 1)
         m.register_type %r(tinyblob)i,   Type::Binary.new(limit: 2**8 - 1)
         m.register_type %r(text)i,       Type::Text.new(limit: 2**16 - 1)
@@ -672,7 +674,7 @@ module ActiveRecord
         m.register_type(%r(enum)i) do |sql_type|
           limit = sql_type[/^enum\((.+)\)/i, 1]
             .split(',').map{|enum| enum.strip.length - 2}.max
-          Type::String.new(limit: limit)
+          MysqlString.new(limit: limit)
         end
       end
 
@@ -847,6 +849,26 @@ module ActiveRecord
           end
         end
       end
+
+      class MysqlString < Type::String # :nodoc:
+        def type_cast_for_database(value)
+          case value
+          when true then "1"
+          when false then "0"
+          else super
+          end
+        end
+
+        private
+
+        def cast_value(value)
+          case value
+          when true then "1"
+          when false then "0"
+          else super
+          end
+        end
+      end
     end
   end
 end
diff --git a/activerecord/lib/active_record/type/string.rb b/activerecord/lib/active_record/type/string.rb
index 150defb106..fbc0af2c5a 100644
--- a/activerecord/lib/active_record/type/string.rb
+++ b/activerecord/lib/active_record/type/string.rb
@@ -15,8 +15,8 @@ module ActiveRecord
         case value
         when ::Numeric, ActiveSupport::Duration then value.to_s
         when ::String then ::String.new(value)
-        when true then "1"
-        when false then "0"
+        when true then "t"
+        when false then "f"
         else super
         end
       end
@@ -25,8 +25,8 @@ module ActiveRecord
 
       def cast_value(value)
         case value
-        when true then "1"
-        when false then "0"
+        when true then "t"
+        when false then "f"
         # String.new is slightly faster than dup
         else ::String.new(value.to_s)
         end