2 files changed, 17 insertions, 4 deletions
diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
index a75883cd3a..4a23287448 100644
--- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
@@ -95,14 +95,27 @@ module ActiveRecord
         assert_equal @conn.default_sequence_name('ex_with_custom_index_type_pk', 'id'), seq
       end
 
+      def test_tinyint_integer_typecasting
+        @conn.exec_query('drop table if exists ex_with_non_boolean_tinyint_column')
+        @conn.exec_query(<<-eosql)
+          CREATE TABLE `ex_with_non_boolean_tinyint_column` (
+            `status` TINYINT(4))
+        eosql
+        insert(@conn, { 'status' => 2 }, 'ex_with_non_boolean_tinyint_column')
+
+        result = @conn.exec_query('SELECT status FROM ex_with_non_boolean_tinyint_column')
+
+        assert_equal 2, result.column_types['status'].type_cast(result.last['status'])
+      end
+
       private
-      def insert(ctx, data)
+      def insert(ctx, data, table='ex')
         binds   = data.map { |name, value|
-          [ctx.columns('ex').find { |x| x.name == name }, value]
+          [ctx.columns(table).find { |x| x.name == name }, value]
         }
         columns = binds.map(&:first).map(&:name)
 
-        sql = "INSERT INTO ex (#{columns.join(", ")})
+        sql = "INSERT INTO #{table} (#{columns.join(", ")})
                VALUES (#{(['?'] * columns.length).join(', ')})"
 
         ctx.exec_insert(sql, 'SQL', binds)
diff --git a/activerecord/test/cases/callbacks_test.rb b/activerecord/test/cases/callbacks_test.rb
index 187cad9599..c8f56e3c73 100644
--- a/activerecord/test/cases/callbacks_test.rb
+++ b/activerecord/test/cases/callbacks_test.rb
@@ -43,7 +43,7 @@ class CallbackDeveloper < ActiveRecord::Base
 end
 
 class CallbackDeveloperWithFalseValidation < CallbackDeveloper
-  before_validation proc { |model| model.history << [:before_validation, :returning_false]; return false }
+  before_validation proc { |model| model.history << [:before_validation, :returning_false]; false }
   before_validation proc { |model| model.history << [:before_validation, :should_never_get_here] }
 end