Fix nested condition

Author: bopm

lib/ransack/adapters/active_record/context.rb

@@ -201,7 +201,14 @@ def extract_correlated_key(join_root)
               nil
             end
           when Arel::Nodes::And
-            extract_correlated_key(join_root.left) || extract_correlated_key(join_root.right)
+            if join_root.children.any?
+              join_root.children.each do |child|
+                eck = extract_correlated_key(child)
+                return eck unless eck.nil?
+              end
+            else
+              extract_correlated_key(join_root.left) || extract_correlated_key(join_root.right)
+            end
           else
             # eg parent was Arel::Nodes::And and the evaluated side was one of
             # Arel::Nodes::Grouping or MultiTenant::TenantEnforcementClause

lib/ransack/nodes/condition.rb

@@ -235,6 +235,9 @@ def formatted_values_for_attribute(attr)
             val = attr.ransacker.formatter.call(val)
           end
           val = predicate.format(val)
+          if val.is_a?(String) && (val.starts_with?('%') || val.ends_with?('%'))
+            val = Arel::Nodes::Quoted.new(val)
+          end
           val
         end
         if predicate.wants_array
@@ -288,12 +291,24 @@ def negative?
       def arel_predicate
         predicate = attributes.map { |attribute|
           association = attribute.parent
-          if negative? && attribute.associated_collection?
+          parent_table = association.table
+
+          if negative? && attribute.associated_collection? && not_nested_condition(attribute, parent_table)
             query = context.build_correlated_subquery(association)
             context.remove_association(association)
-            if self.predicate_name == 'not_null' && self.value
-              query.where(format_predicate(attribute))
-              Arel::Nodes::In.new(context.primary_key, Arel.sql(query.to_sql))
+
+            case self.predicate_name
+            when 'not_null'
+              if self.value
+                query.where(format_predicate(attribute))
+                Arel::Nodes::In.new(context.primary_key, Arel.sql(query.to_sql))
+              else
+                query.where(format_predicate(attribute).not)
+                Arel::Nodes::NotIn.new(context.primary_key, Arel.sql(query.to_sql))
+              end
+            when 'not_cont'
+              query.where(attribute.attr.matches(formatted_values_for_attribute(attribute)))
+              Arel::Nodes::NotIn.new(context.primary_key, Arel.sql(query.to_sql))
             else
               query.where(format_predicate(attribute).not)
               Arel::Nodes::NotIn.new(context.primary_key, Arel.sql(query.to_sql))
@@ -304,10 +319,6 @@ def arel_predicate
         }.reduce(combinator_method)
 
         if replace_right_node?(predicate)
-          # Replace right node object to plain integer value in order to avoid
-          # ActiveModel::RangeError from Arel::Node::Casted.
-          # The error can be ignored here because RDBMSs accept large numbers
-          # in condition clauses.
           plain_value = predicate.right.value
           predicate.right = plain_value
         end
@@ -317,6 +328,10 @@ def arel_predicate
 
       private
 
+      def not_nested_condition(attribute, parent_table)
+        parent_table.class != Arel::Nodes::TableAlias && attribute.name.starts_with?(parent_table.name)
+      end
+
       def combinator_method
         combinator === Constants::OR ? :or : :and
       end