Treat any limit > 4 as bigint

1 files changed, 8 insertions, 6 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
index ed1f08ac4f..dd54950790 100755
--- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
@@ -111,10 +111,11 @@ module ActiveRecord
             else
               super # we could return 65535 here, but we leave it undecorated by default
             end
-          when /^int/i;       4
           when /^bigint/i;    8
-          when /^smallint/i;  2
+          when /^int/i;       4
           when /^mediumint/i; 3
+          when /^smallint/i;  2
+          when /^tinyint/i;   1
           else
             super
           end
@@ -472,10 +473,11 @@ module ActiveRecord
         return super unless type.to_s == 'integer'
 
         case limit
-        when 1..2;   'smallint'
-        when 3;      'mediumint'
-        when 4, nil; 'int(11)'
-        when 5..8;   'bigint'
+        when 1;       'tinyint'
+        when 2;       'smallint'
+        when 3;       'mediumint'
+        when 4, nil;  'int(11)'
+        else;         'bigint'
         end
       end