kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #27274 from kamipo/primary_key_with_auto_increment_and_bigint

Browse source 
Make `:auto_increment` option works on `:bigint`
This commit is contained in:
Matthew Draper 2016-12-06 10:01:43 +10:30 committed by GitHub
commit 9b6f312734
3 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb
View file

@ -44,8 +44,12 @@ module ActiveRecord
def primary_key(name, type = :primary_key, **options) def primary_key(name, type = :primary_key, **options)
if type == :uuid if type == :uuid
options[:default] = options.fetch(:default, "gen_random_uuid()") options[:default] = options.fetch(:default, "gen_random_uuid()")
elsif options.delete(:auto_increment) == true && type == :integer elsif options.delete(:auto_increment) == true && %i(integer bigint).include?(type)
type = :serial type = if type == :bigint || options[:limit] == 8
:bigserial
else
:serial
end
end end
super super

2
activerecord/lib/active_record/connection_adapters/sqlite3/schema_definitions.rb
View file

@ -3,7 +3,7 @@ module ActiveRecord
module SQLite3 module SQLite3
module ColumnMethods module ColumnMethods
def primary_key(name, type = :primary_key, **options) def primary_key(name, type = :primary_key, **options)
if options.delete(:auto_increment) == true && type == :integer if options.delete(:auto_increment) == true && %i(integer bigint).include?(type)
type = :primary_key type = :primary_key
end end

12
activerecord/test/cases/primary_keys_test.rb
View file

@ -224,7 +224,6 @@ class PrimaryKeyWithAutoIncrementTest < ActiveRecord::TestCase
def setup def setup
@connection = ActiveRecord::Base.connection @connection = ActiveRecord::Base.connection
@connection.create_table(:auto_increments, id: :integer, auto_increment: true, force: true)
end end
def teardown def teardown
@ -232,6 +231,17 @@ class PrimaryKeyWithAutoIncrementTest < ActiveRecord::TestCase
end end
def test_primary_key_with_auto_increment def test_primary_key_with_auto_increment
@connection.create_table(:auto_increments, id: :integer, auto_increment: true, 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)
assert_auto_incremented
end
private
def assert_auto_incremented
record1 = AutoIncrement.create! record1 = AutoIncrement.create!
assert_not_nil record1.id assert_not_nil record1.id