1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index ceeb0ec39d..4093a1a209 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -313,7 +313,7 @@ module ActiveRecord
         macro == :belongs_to
       end
 
-      def proxy_class
+      def association_class
         case macro
         when :belongs_to
           if options[:polymorphic]
@@ -394,6 +394,10 @@ module ActiveRecord
         @source_reflection_names ||= (options[:source] ? [options[:source]] : [name.to_s.singularize, name]).collect { |n| n.to_sym }
       end
 
+      def association_primary_key
+        source_reflection.association_primary_key
+      end
+
       def check_validity!
         if through_reflection.nil?
           raise HasManyThroughAssociationNotFoundError.new(active_record.name, self)