From 50e6b69018ca4dfcdd30030f1c402da9b0d9563b Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Fri, 11 Oct 2013 17:27:34 -0700
Subject: extract conditional to the caller

---
 .../active_record/associations/join_dependency.rb  | 24 ++++++++++++----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/associations/join_dependency.rb b/activerecord/lib/active_record/associations/join_dependency.rb
index 650f3a986a..060e3f3811 100644
--- a/activerecord/lib/active_record/associations/join_dependency.rb
+++ b/activerecord/lib/active_record/associations/join_dependency.rb
@@ -213,32 +213,34 @@ module ActiveRecord
         parent.children.each do |node|
           primary_id = type_caster.type_cast row[primary_key]
           if ar_parent.id == primary_id
+            if node.reflection.collection?
+              other = ar_parent.association(node.reflection.name)
+              other.loaded!
+            end
+
+            next if row[node.aliased_primary_key].nil?
+
             model = construct_model(ar_parent, node, row)
-            construct(model, node, row, rs) if model
+            construct(model, node, row, rs)
           end
         end
       end
 
       def construct_model(record, join_part, row)
         if join_part.reflection.collection?
-          model = join_part.instantiate(row) unless row[join_part.aliased_primary_key].nil?
+          model = join_part.instantiate(row)
           other = record.association(join_part.reflection.name)
-          other.loaded!
           other.target.push(model) if model
           other.set_inverse_instance(model)
         else
           return record.association(join_part.reflection.name).target if record.association_cache.key?(join_part.reflection.name)
-          model = join_part.instantiate(row) unless row[join_part.aliased_primary_key].nil?
-          set_target_and_inverse(join_part, model, record)
+          model = join_part.instantiate(row)
+          other = record.association(join_part.reflection.name)
+          other.target = model
+          other.set_inverse_instance(model)
         end
         model
       end
-
-      def set_target_and_inverse(join_part, model, record)
-        other = record.association(join_part.reflection.name)
-        other.target = model
-        other.set_inverse_instance(model)
-      end
     end
   end
 end
-- 
cgit v1.2.3