Merge pull request #35 from jerhinesmith/fix-joins-in-rails-5-2

`make_constraints` returns an array in rails 5.2, so remove unnecessary coercing
activerecord-hackery · Jan 23, 2018 · 0386f06 · 0386f06
2 parents 66142a7 + f2e0468
commit 0386f06
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/polyamorous/activerecord_5.2_ruby_2/join_dependency.rb b/lib/polyamorous/activerecord_5.2_ruby_2/join_dependency.rb
@@ -84,7 +84,7 @@ def make_polyamorous_left_outer_joins(parent, child)
       join_type = Arel::Nodes::OuterJoin
       info      = make_constraints parent, child, tables, join_type
 
-      [info] + child.children.flat_map { |c|
+      info + child.children.flat_map { |c|
         make_polyamorous_left_outer_joins(child, c)
       }
     end
@@ -96,7 +96,7 @@ def make_polyamorous_inner_joins(parent, child)
       join_type = child.join_type || Arel::Nodes::InnerJoin
       info      = make_constraints parent, child, tables, join_type
 
-      [info] + child.children.flat_map { |c|
+      info + child.children.flat_map { |c|
         make_polyamorous_inner_joins(child, c)
       }
     end