aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-10-10 14:12:55 -0300
committerGitHub <noreply@github.com>2016-10-10 14:12:55 -0300
commit15fa282148c3fef064e9cee6564f60ea32f6a2d5 (patch)
tree1f15e7147a961f64f8e161029572af4f34bd81f7 /activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
parent4d93d381e0e2eb30c7e12a0b88fdfb88ec37f399 (diff)
parent24a1a6a844120dae7e5b304932b677e5e6fcb790 (diff)
downloadrails-15fa282148c3fef064e9cee6564f60ea32f6a2d5.tar.gz
rails-15fa282148c3fef064e9cee6564f60ea32f6a2d5.tar.bz2
rails-15fa282148c3fef064e9cee6564f60ea32f6a2d5.zip
Merge pull request #26747 from kamipo/name_is_not_column_option
`name` is not a column option
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
index 8bb7362c2e..bc378c0476 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb
@@ -8,7 +8,6 @@ module ActiveRecord
module ColumnDumper
def column_spec(column)
spec = Hash[prepare_column_options(column).map { |k, v| [k, "#{k}: #{v}"] }]
- spec[:name] = column.name.inspect
spec[:type] = schema_type(column).to_s
spec
end
@@ -53,7 +52,7 @@ module ActiveRecord
# Lists the valid migration options
def migration_keys
- [:name, :limit, :precision, :scale, :default, :null, :collation, :comment]
+ [:limit, :precision, :scale, :default, :null, :collation, :comment]
end
private