diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-02-21 17:07:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-21 17:07:33 -0500 |
| commit | 057ce451eb860864b99c6d9f1d111d735b742d03 (patch) | |
| tree | 2485668fc2bbddee62b3c87a2249a3f7cd26483f /activerecord | |
| parent | ecca24e2d76f647f342e6bdf8c68a693ff49ae9a (diff) | |
| parent | 7f45c2d02a732cc724a021fd5907c1f00b7e1fe9 (diff) | |
| download | rails-057ce451eb860864b99c6d9f1d111d735b742d03.tar.gz rails-057ce451eb860864b99c6d9f1d111d735b742d03.tar.bz2 rails-057ce451eb860864b99c6d9f1d111d735b742d03.zip | |
Merge pull request #28042 from kamipo/add_changelog_for_27384
Add CHANGELOG entry for #27384 and #27762
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/primary_keys_test.rb | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index fd9c08c705..b27c03d935 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,7 @@ +* All integer-like PKs are autoincrement unless they have an explicit default. + + *Matthew Draper* + * Omit redundant `using: :btree` for schema dumping. *Ryuta Kamizono* diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb index 98b9c91489..03c8644229 100644 --- a/activerecord/test/cases/primary_keys_test.rb +++ b/activerecord/test/cases/primary_keys_test.rb @@ -238,13 +238,13 @@ class PrimaryKeyWithAutoIncrementTest < ActiveRecord::TestCase @connection.drop_table(:auto_increments, if_exists: true) end - def test_primary_key_with_auto_increment - @connection.create_table(:auto_increments, id: :integer, auto_increment: true, force: true) + def test_primary_key_with_integer + @connection.create_table(:auto_increments, id: :integer, force: true) assert_auto_incremented end - def test_primary_key_with_auto_increment_and_bigint - @connection.create_table(:auto_increments, id: :bigint, auto_increment: true, force: true) + def test_primary_key_with_bigint + @connection.create_table(:auto_increments, id: :bigint, force: true) assert_auto_incremented end |