1 files changed, 15 insertions, 17 deletions
diff --git a/activerecord/lib/active_record/associations/preloader/association.rb b/activerecord/lib/active_record/associations/preloader/association.rb
index 9bb6a613e1..fe696e0d6e 100644
--- a/activerecord/lib/active_record/associations/preloader/association.rb
+++ b/activerecord/lib/active_record/associations/preloader/association.rb
@@ -17,26 +17,20 @@ module ActiveRecord
         end
 
         def run(preloader)
-          preload(preloader)
-        end
-
-        def preload(preloader)
-          raise NotImplementedError
-        end
-
-        # The name of the key on the associated records
-        def association_key_name
-          raise NotImplementedError
-        end
-
-        # The name of the key on the model which declares the association
-        def owner_key_name
-          raise NotImplementedError
+          associated_records_by_owner(preloader).each do |owner, records|
+            associate_records_to_owner(owner, records)
+          end
         end
 
         private
-          def options
-            reflection.options
+          # The name of the key on the associated records
+          def association_key_name
+            reflection.join_primary_key(klass)
+          end
+
+          # The name of the key on the model which declares the association
+          def owner_key_name
+            reflection.join_foreign_key
           end
 
           def associated_records_by_owner(preloader)
@@ -51,6 +45,10 @@ module ActiveRecord
             end
           end
 
+          def associate_records_to_owner(owner, records)
+            raise NotImplementedError
+          end
+
           def owner_keys
             unless defined?(@owner_keys)
               @owner_keys = owners.map do |owner|