aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2016-05-31 11:51:13 -0400
committerSean Griffin <sean@seantheprogrammer.com>2016-05-31 11:51:13 -0400
commitfc3bfdbdf5173df3fba5940dbc20175d7a1bf308 (patch)
treee6a6911265a0f2678ddab3bfa07a1b8d81ad9da8 /activerecord/lib/active_record
parentc8be4574a2a35c896560ff58b26111ad6dd9d60f (diff)
parent706f7e9c3e2a4807e37b1a1ef21febd6444adf6f (diff)
downloadrails-fc3bfdbdf5173df3fba5940dbc20175d7a1bf308.tar.gz
rails-fc3bfdbdf5173df3fba5940dbc20175d7a1bf308.tar.bz2
rails-fc3bfdbdf5173df3fba5940dbc20175d7a1bf308.zip
Merge pull request #25213 from kamipo/do_not_include_default_column_limit
Do not include default column limit in schema.rb
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb4
1 files changed, 2 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 44b4b547f3..718a6c5b91 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -41,14 +41,14 @@ module ActiveRecord
NATIVE_DATABASE_TYPES = {
primary_key: "int auto_increment PRIMARY KEY",
string: { name: "varchar", limit: 255 },
- text: { name: "text" },
+ text: { name: "text", limit: 65535 },
integer: { name: "int", limit: 4 },
float: { name: "float" },
decimal: { name: "decimal" },
datetime: { name: "datetime" },
time: { name: "time" },
date: { name: "date" },
- binary: { name: "blob" },
+ binary: { name: "blob", limit: 65535 },
boolean: { name: "tinyint", limit: 1 },
json: { name: "json" },
}