From 684caf55038234374a17c1e010e8b18d2dc0c90f Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Mon, 18 May 2015 10:31:02 -0700 Subject: [PATCH] Fix `serial?` with quoted sequence name --- .../connection_adapters/postgresql/column.rb | 3 ++- activerecord/test/cases/primary_keys_test.rb | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/column.rb b/activerecord/lib/active_record/connection_adapters/postgresql/column.rb index be13ead120..bfa03fa136 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/column.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/column.rb @@ -8,7 +8,8 @@ class PostgreSQLColumn < Column #:nodoc: def serial? return unless default_function - %r{\Anextval\('(?.+)_#{name}_seq'::regclass\)\z} === default_function + table_name = @table_name || '(?.+)' + %r{\Anextval\('"?#{table_name}_#{name}_seq"?'::regclass\)\z} === default_function end end end diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb index 83be9a75d8..b8433f0bba 100644 --- a/activerecord/test/cases/primary_keys_test.rb +++ b/activerecord/test/cases/primary_keys_test.rb @@ -175,6 +175,14 @@ def test_primary_key_update_with_custom_key_name dashboard = Dashboard.first assert_equal '2', dashboard.id end + + if current_adapter?(:PostgreSQLAdapter) + def test_serial_with_quoted_sequence_name + column = MixedCaseMonkey.columns_hash[MixedCaseMonkey.primary_key] + assert_equal "nextval('\"mixed_case_monkeys_monkeyID_seq\"'::regclass)", column.default_function + assert column.serial? + end + end end class PrimaryKeyWithNoConnectionTest < ActiveRecord::TestCase -- GitLab