aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
diff options
context:
space:
mode:
authorJeremy Daer <jeremydaer@gmail.com>2015-09-19 15:53:42 -0700
committerJeremy Daer <jeremydaer@gmail.com>2015-09-19 15:53:42 -0700
commit96a0475d10e7a7d95d938518183c581f29cd9045 (patch)
tree43ea7d557323564a46e335c9ab51c44dd6a3eae6 /activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
parent4726efa127a804f6d765b6268b3ff9e68f69f72d (diff)
parentf7a35cc5cfb1f970cdea58fb9b47e06c57f532f9 (diff)
downloadrails-96a0475d10e7a7d95d938518183c581f29cd9045.tar.gz
rails-96a0475d10e7a7d95d938518183c581f29cd9045.tar.bz2
rails-96a0475d10e7a7d95d938518183c581f29cd9045.zip
Merge pull request #21607 from kamipo/remove_unnecessary_display_width
Remove unnecessary display width
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb5
1 files changed, 3 insertions, 2 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 74f03f62d0..f31f763803 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -247,7 +247,7 @@ module ActiveRecord
QUOTED_TRUE, QUOTED_FALSE = '1', '0'
NATIVE_DATABASE_TYPES = {
- primary_key: "int(11) auto_increment PRIMARY KEY",
+ primary_key: "int auto_increment PRIMARY KEY",
string: { name: "varchar", limit: 255 },
text: { name: "text" },
integer: { name: "int", limit: 4 },
@@ -1046,8 +1046,9 @@ module ActiveRecord
when 1; 'tinyint'
when 2; 'smallint'
when 3; 'mediumint'
- when nil, 4, 11; 'int(11)' # compatibility with MySQL default
+ when nil, 4; 'int'
when 5..8; 'bigint'
+ when 11; 'int(11)' # backward compatibility with Rails 2.0
else raise(ActiveRecordError, "No integer type has byte size #{limit}")
end
end