Merge pull request #30208 from kamipo/extract_primary_key_to_abstract_reflection

Extract `primary_key` to `AbstractReflection`

1 files changed, 4 insertions, 8 deletions

diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index 564dbcb342..b2c62cd686 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -329,6 +329,10 @@ module ActiveRecord
         def join_pk(_)
           foreign_key
         end
+
+        def primary_key(klass)
+          klass.primary_key || raise(UnknownPrimaryKey.new(klass))
+        end
     end
 
     # Base class for AggregateReflection and AssociationReflection. Objects of
@@ -697,10 +701,6 @@ module ActiveRecord
         def derive_join_table
           ModelSchema.derive_join_table_name active_record.table_name, klass.table_name
         end
-
-        def primary_key(klass)
-          klass.primary_key || raise(UnknownPrimaryKey.new(klass))
-        end
     end
 
     class HasManyReflection < AssociationReflection # :nodoc:
@@ -1020,10 +1020,6 @@ module ActiveRecord
           end
         end
 
-        def primary_key(klass)
-          klass.primary_key || raise(UnknownPrimaryKey.new(klass))
-        end
-
         def inverse_name; delegate_reflection.send(:inverse_name); end
 
         def derive_class_name