diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2016-12-08 13:15:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-08 13:15:13 -0500 |
| commit | 17b09f4fca976063187be6494e64430850c37632 (patch) | |
| tree | bc2f972fe6174e3d4c2111330e6fd012d2d97d0f /activerecord/lib/active_record | |
| parent | e2933a7e3849d19f28971eb917029b951ca363ec (diff) | |
| parent | 6be637440304076734700644f73d994dbd5225f8 (diff) | |
| download | rails-17b09f4fca976063187be6494e64430850c37632.tar.gz rails-17b09f4fca976063187be6494e64430850c37632.tar.bz2 rails-17b09f4fca976063187be6494e64430850c37632.zip | |
Merge pull request #27278 from kamipo/should_be_sync_primary_key_definition
Should be sync the `primary_key` definition with actually created
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index 0e4bc1afcb..e4b3e296f5 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -39,7 +39,7 @@ module ActiveRecord self.emulate_booleans = true NATIVE_DATABASE_TYPES = { - primary_key: "BIGINT(8) UNSIGNED auto_increment PRIMARY KEY", + primary_key: "bigint auto_increment PRIMARY KEY", string: { name: "varchar", limit: 255 }, text: { name: "text", limit: 65535 }, integer: { name: "int", limit: 4 }, |