diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2016-03-01 15:33:05 -0300 |
---|---|---|
committer | Rafael França <rafaelmfranca@gmail.com> | 2016-03-01 15:33:05 -0300 |
commit | 7acb695653500d87a16dba3bc2c8e242e27d99d7 (patch) | |
tree | fdaefd9374a4b497dce89ee6ee97909fa7abb09b /activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb | |
parent | 2ef1340bf373f2469550126972247c8aed50b457 (diff) | |
parent | 330512028a5289a80947086f70fe0dec2afbeb7e (diff) | |
download | rails-7acb695653500d87a16dba3bc2c8e242e27d99d7.tar.gz rails-7acb695653500d87a16dba3bc2c8e242e27d99d7.tar.bz2 rails-7acb695653500d87a16dba3bc2c8e242e27d99d7.zip |
Merge pull request #23961 from kamipo/exclude_name_and_type_from_prepare_column_options
Exclude `:name` and `:type` from `prepare_column_options`
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb b/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb index ccf5b6cadc..3cdd46236b 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb @@ -13,7 +13,7 @@ module ActiveRecord return if spec.empty? else spec[:id] = schema_type(column).inspect - spec.merge!(prepare_column_options(column).delete_if { |key, _| [:name, :type, :null].include?(key) }) + spec.merge!(prepare_column_options(column).delete_if { |key, _| key == :null }) end spec end |