Make use of helpers in AssociationReflection

rails · Jan 30, 2011 · 9db4c07 · 9db4c07
1 parent 3fa61cc
commit 9db4c07
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/activerecord/lib/active_record/associations/through_association.rb b/activerecord/lib/active_record/associations/through_association.rb
@@ -47,18 +47,18 @@ def construct_joins
           conditions = []
 
           if @reflection.source_reflection.macro == :belongs_to
-            reflection_primary_key = @reflection.source_reflection.options[:primary_key] ||
+            reflection_primary_key = @reflection.source_reflection.association_primary_key
-                                     @reflection.klass.primary_key
             source_primary_key     = @reflection.source_reflection.foreign_key
+
             if @reflection.options[:source_type]
               column = @reflection.source_reflection.foreign_type
               conditions <<
                 right[column].eq(@reflection.options[:source_type])
             end
           else
             reflection_primary_key = @reflection.source_reflection.foreign_key
-            source_primary_key     = @reflection.source_reflection.options[:primary_key] ||
+            source_primary_key     = @reflection.source_reflection.active_record_primary_key
-                                     @reflection.through_reflection.klass.primary_key
+
             if @reflection.source_reflection.options[:as]
               column = "#{@reflection.source_reflection.options[:as]}_type"
               conditions <<