Ignore polymorphic joins when trying to be consistent with the condit…

…ions
nickd · Sep 14, 2009 · 4d619e8 · 4d619e8
1 parent 8a60547
commit 4d619e8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/searchlogic/active_record/consistency.rb b/lib/searchlogic/active_record/consistency.rb
@@ -17,7 +17,7 @@ def merge_joins_with_searchlogic(*args)
         joins = merge_joins_without_searchlogic(*args)
         joins = joins.collect { |j| j.is_a?(String) ? j.split("  ") : j }.flatten.uniq
         joins = joins.collect do |j|
-          if j.is_a?(String)
+          if j.is_a?(String) && !j =~ / (AND|OR) /i
             j.gsub(/(.*) ON (.*) = (.*)/) do |m|
               sorted = [$2,$3].sort
               "#{$1} ON #{sorted[0]} = #{sorted[1]}"