patch bug fix for activerecord-hackery#1447

jberhang · Mar 1, 2024 · 87a57a7 · 87a57a7
1 parent dbffa8b
commit 87a57a7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/lib/polyamorous/activerecord_6.1_ruby_2/join_dependency.rb b/lib/polyamorous/activerecord_6.1_ruby_2/join_dependency.rb
@@ -56,11 +56,21 @@ def construct_tables_for_association!(join_root, association)
     private
 
     def table_aliases_for(parent, node)
+      @joined_tables ||= {}
       node.reflection.chain.map { |reflection|
-        alias_tracker.aliased_table_for(reflection.klass.arel_table) do
-          root = reflection == node.reflection
-          name = reflection.alias_candidate(parent.table_name)
-          root ? name : "#{name}_join"
+        table, terminated = @joined_tables[reflection]
+        root = reflection == node.reflection
+
+        if table && (!root || !terminated)
+          @joined_tables[reflection] = [table, true] if root
+          table
+        else
+          table = alias_tracker.aliased_table_for(reflection.klass.arel_table) do
+            name = reflection.alias_candidate(parent.table_name)
+            root ? name : "#{name}_join"
+          end
+          @joined_tables[reflection] ||= [table, root] if join_type == Arel::Nodes::OuterJoin
+          table
         end
       }
     end
@@ -89,4 +99,4 @@ def walk_tree(associations, hash)
     end
 
   end
-end
+end
diff --git a/lib/ransack/version.rb b/lib/ransack/version.rb
@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = '4.0.0'
+  VERSION = '4.0.1'
 end