diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2015-10-27 23:07:19 +0900 |
|---|---|---|
| committer | Andrew White <andrew.white@unboxedconsulting.com> | 2015-11-02 12:12:20 +0000 |
| commit | 1fa6c9e5fbedad7fe6b78583571f8ebf2ea4c31d (patch) | |
| tree | 5d9e0ce9934a457ad9f919d3a7bab42708ebf0a9 /activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb | |
| parent | fb6f0d406bb9c4fed7fb63b91fe67ad209487a5f (diff) | |
| download | rails-1fa6c9e5fbedad7fe6b78583571f8ebf2ea4c31d.tar.gz rails-1fa6c9e5fbedad7fe6b78583571f8ebf2ea4c31d.tar.bz2 rails-1fa6c9e5fbedad7fe6b78583571f8ebf2ea4c31d.zip | |
Allow bigint with default nil for avoiding auto increment primary key
Such as #10404, #18206.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb index 29e8c73d46..ca7dfda80d 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql/schema_definitions.rb @@ -3,7 +3,7 @@ module ActiveRecord module MySQL module ColumnMethods def primary_key(name, type = :primary_key, **options) - options[:auto_increment] = true if type == :bigint + options[:auto_increment] = true if type == :bigint && !options.key?(:default) super end |