diff options
| author | Matthew Draper <matthew@trebex.net> | 2017-01-20 00:58:41 +1030 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-20 00:58:41 +1030 |
| commit | 7b4514c6ab2703b9a9b6574f3559cae722a33d4f (patch) | |
| tree | 869ed3c657996496b83a438b81af1f0a9d0195c7 /activerecord/lib/active_record/migration/compatibility.rb | |
| parent | df3351dfe5e109b8e10f350150a7d727abad9521 (diff) | |
| parent | 72e59fedb126ab2f42290796108a81f503257de5 (diff) | |
| download | rails-7b4514c6ab2703b9a9b6574f3559cae722a33d4f.tar.gz rails-7b4514c6ab2703b9a9b6574f3559cae722a33d4f.tar.bz2 rails-7b4514c6ab2703b9a9b6574f3559cae722a33d4f.zip | |
Merge pull request #27384 from matthewd/bigint-pk-tweaks
Tweak bigint PK handling
Diffstat (limited to 'activerecord/lib/active_record/migration/compatibility.rb')
| -rw-r--r-- | activerecord/lib/active_record/migration/compatibility.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/migration/compatibility.rb b/activerecord/lib/active_record/migration/compatibility.rb index a5d8893634..ffeca2c91e 100644 --- a/activerecord/lib/active_record/migration/compatibility.rb +++ b/activerecord/lib/active_record/migration/compatibility.rb @@ -24,9 +24,8 @@ module ActiveRecord # Since 5.1 Postgres adapter uses bigserial type for primary # keys by default and MySQL uses bigint. This compat layer makes old migrations utilize # serial/int type instead -- the way it used to work before 5.1. - if options[:id].blank? + unless options.key?(:id) options[:id] = :integer - options[:auto_increment] = true end super |