eliminate conditional in JoinHelper

rails · Jul 24, 2013 · 67978d6 · 67978d6
1 parent b8aebb0
commit 67978d6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/activerecord/lib/active_record/associations/join_helper.rb b/activerecord/lib/active_record/associations/join_helper.rb
@@ -19,7 +19,7 @@ def construct_tables
 
           if reflection.source_macro == :has_and_belongs_to_many
             tables << alias_tracker.aliased_table_for(
-              (reflection.source_reflection || reflection).join_table,
+              reflection.source_reflection.join_table,
               table_alias_for(reflection, true)
             )
           end

diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
@@ -269,7 +269,7 @@ def through_reflection
       end
 
       def source_reflection
-        nil
+        self
       end
 
       # A chain of reflections from this one back to the owner. For more see the explanation in