diff options
| author | Jon McCartie <jon@mccartie.com> | 2016-08-21 09:50:24 -0700 |
|---|---|---|
| committer | Jon McCartie <jon@mccartie.com> | 2016-12-05 11:34:35 -0800 |
| commit | b92ae610699f991e4616409815fa1e7f134dacc5 (patch) | |
| tree | b5ef1864174e60522e9e05a0f33c400a348dc076 /activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb | |
| parent | 575212a1ba2e4d170985531402c6e3d27af5a0ea (diff) | |
| download | rails-b92ae610699f991e4616409815fa1e7f134dacc5.tar.gz rails-b92ae610699f991e4616409815fa1e7f134dacc5.tar.bz2 rails-b92ae610699f991e4616409815fa1e7f134dacc5.zip | |
Change MySQL and Postgresql to use Bigint primary keys
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 | 8 |
1 files changed, 3 insertions, 5 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 9b02d8a34b..2065816501 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql/schema_dumper.rb @@ -3,11 +3,9 @@ module ActiveRecord module MySQL module ColumnDumper def column_spec_for_primary_key(column) - if column.bigint? - spec = { id: :bigint.inspect } - spec[:default] = schema_default(column) || "nil" unless column.auto_increment? - else - spec = super + spec = super + if column.type == :integer && !column.auto_increment? + spec[:default] = schema_default(column) || "nil" end spec[:unsigned] = "true" if column.unsigned? spec |