diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-27 01:06:33 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-27 01:07:22 -0700 |
commit | 4498aad4acda002b8f213f13c4acd52cba04d224 (patch) | |
tree | 1aa0e6d3beb2d5d8555c91fb73068caf59896784 /activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | |
parent | b2b761166d28c1aba9165da76fba28027171fd2d (diff) | |
download | rails-4498aad4acda002b8f213f13c4acd52cba04d224.tar.gz rails-4498aad4acda002b8f213f13c4acd52cba04d224.tar.bz2 rails-4498aad4acda002b8f213f13c4acd52cba04d224.zip |
MySQL: treat integer with :limit => 11 as a display width, not byte size, for backward-compatibility.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql_adapter.rb')
-rwxr-xr-x | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index dd54950790..c5962764f5 100755 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -473,11 +473,12 @@ module ActiveRecord return super unless type.to_s == 'integer' case limit - when 1; 'tinyint' - when 2; 'smallint' - when 3; 'mediumint' - when 4, nil; 'int(11)' - else; 'bigint' + when 1; 'tinyint' + when 2; 'smallint' + when 3; 'mediumint' + when nil, 4, 11; 'int(11)' # compatibility with MySQL default + when 5..8; 'bigint' + else raise(ActiveRecordError, "No integer type has byte size #{limit}") end end |