diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-03-11 12:03:57 -0300 |
|---|---|---|
| committer | Rafael França <rafaelmfranca@gmail.com> | 2016-03-11 12:03:57 -0300 |
| commit | f8d9c0510742b4f2d440f5223803453aaf0fbab0 (patch) | |
| tree | 8cec4886bf36abe7decbee117613ff1dde84cb45 /activerecord/lib/active_record/connection_adapters/abstract | |
| parent | 4d7e96910f7704e08eb193ddf47323cc71a8ab11 (diff) | |
| parent | 270bcebdf79fd033e8451a2b6ab1c3db1dfb87b2 (diff) | |
| download | rails-f8d9c0510742b4f2d440f5223803453aaf0fbab0.tar.gz rails-f8d9c0510742b4f2d440f5223803453aaf0fbab0.tar.bz2 rails-f8d9c0510742b4f2d440f5223803453aaf0fbab0.zip | |
Merge pull request #24054 from kamipo/extract_default_primary_key
Extract `default_primary_key?` to refactor `column_spec_for_primary_key`
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
| -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 9e653cd7c4..4880d216d6 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) if column.bigint? :bigint |