diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2016-02-12 07:26:05 +0900 |
---|---|---|
committer | Ryuta Kamizono <kamipo@gmail.com> | 2016-03-11 14:43:20 +0900 |
commit | 270bcebdf79fd033e8451a2b6ab1c3db1dfb87b2 (patch) | |
tree | 2feb914887aa64094e8af50011dbd4d0ba95e95a /activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb | |
parent | a101115d5b8011278891f30f69901f9583ea7685 (diff) | |
download | rails-270bcebdf79fd033e8451a2b6ab1c3db1dfb87b2.tar.gz rails-270bcebdf79fd033e8451a2b6ab1c3db1dfb87b2.tar.bz2 rails-270bcebdf79fd033e8451a2b6ab1c3db1dfb87b2.zip |
Extract `default_primary_key?` to refactor `column_spec_for_primary_key`
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.rb | 6 |
1 files changed, 5 insertions, 1 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 2209874d0a..e5dc7d9b06 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_dumper.rb @@ -14,7 +14,7 @@ module ActiveRecord end def column_spec_for_primary_key(column) - return if column.type == :integer + return {} if default_primary_key?(column) spec = { id: schema_type(column).inspect } spec.merge!(prepare_column_options(column)) end @@ -56,6 +56,10 @@ module ActiveRecord private + def default_primary_key?(column) + schema_type(column) == :integer + end + def schema_type(column) column.type end |