aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-04-09 04:39:15 +0900
committerGitHub <noreply@github.com>2019-04-09 04:39:15 +0900
commit35d388b2e9639e5f1c1db032ded04dd5cda7bceb (patch)
tree0c1a463d1cc9ab5e4628a4a056076b9dd3a9fdb3 /activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb
parent61073e3190fe149ed5bf46c8f10276a2a7155112 (diff)
parentf185e0ebc9cc18c596eb9cab1a9cd99e26a20500 (diff)
downloadrails-35d388b2e9639e5f1c1db032ded04dd5cda7bceb.tar.gz
rails-35d388b2e9639e5f1c1db032ded04dd5cda7bceb.tar.bz2
rails-35d388b2e9639e5f1c1db032ded04dd5cda7bceb.zip
Merge pull request #35890 from kamipo/except_table_name_from_column
Except `table_name` from column objects
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb
index ad3a8d1fd9..a24c432893 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql/schema_statements.rb
@@ -174,9 +174,8 @@ module ActiveRecord
default,
type_metadata,
field[:Null] == "YES",
- table_name,
default_function,
- field[:Collation],
+ collation: field[:Collation],
comment: field[:Comment].presence
)
end