Changeset 5401

Timestamp:

Sep 3, 2010, 1:58:11 PM (12 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1504: Add support for LIKE expressions to JEP parser

The parse will detect situations were the right hand argument of expressions like foo == 'bar%' is a string constant that includes a '%'. If so, the parser will create a LIKE-restriction instead of an EQUALS-restriction.

File:

• trunk/src/core/net/sf/basedb/util/jep/convert/EqualsConverter.java (modified) (2 diffs)

trunk/src/core/net/sf/basedb/util/jep/convert/EqualsConverter.java

@@ -22 +22 @@
 package net.sf.basedb.util.jep.convert;
 
+import net.sf.basedb.core.query.Expression;
 import net.sf.basedb.core.query.Restriction;
 import net.sf.basedb.core.query.Restrictions;
 import net.sf.basedb.util.jep.Jep;
 
+import org.nfunk.jep.ASTConstant;
 import org.nfunk.jep.Node;
 
@@ -66 +68 @@
   }
   /**
-    Convert to restriction by calling {@link Restrictions#eq(net.sf.basedb.core.query.Expression, net.sf.basedb.core.query.Expression)}.
+    Convert to restriction by calling {@link Restrictions#eq(Expression, Expression)}.
+    If the right-hand node is string constant containing '%' 
+    {@link Restrictions#like(Expression, Expression)} is used instead (since 2.16).
   */
   @Override
   public Restriction toRestriction(Node node)
   {
-    return Restrictions.eq(
-        Jep.nodeToExpression(node.jjtGetChild(0)),
-        Jep.nodeToExpression(node.jjtGetChild(1))
-      );
+    Node lNode = node.jjtGetChild(0);
+    Node rNode = node.jjtGetChild(1);
+    Expression left = Jep.nodeToExpression(lNode);
+    Expression right = Jep.nodeToExpression(rNode);
+    boolean useLike = false;
+    if (rNode instanceof ASTConstant)
+    {
+      ASTConstant constNode = (ASTConstant)rNode;
+      Object constValue = constNode.getValue();
+      if (constValue instanceof String) 
+      {
+        useLike = ((String)constValue).contains("%");
+      }
+    }
+    return useLike ? Restrictions.like(left, right) : Restrictions.eq(left, right);
   }
   // -------------------------------------------