Merge pull request #85 from ottboy4/master

Fixed NOT LIKE

Author: omershelef

src/main/java/org/nlpcn/es4sql/parse/SqlParser.java

@@ -121,10 +121,13 @@ private void explanCond(String opear, SQLExpr expr, Where where) throws SqlParse
                     parseValue(between.endExpr)});
             where.addWhere(condition);
         } else if (expr instanceof SQLNotExpr){
-            String left = ((SQLBinaryOpExpr) ((SQLNotExpr) expr).getExpr()).getLeft().toString();
-            SQLExpr right = ((SQLBinaryOpExpr) ((SQLNotExpr) expr).getExpr()).getRight();
-            Condition condition = new Condition(CONN.valueOf(opear),left, Condition.OPEAR.N, parseValue(right));
-            where.addWhere(condition);
+			SQLBinaryOpExpr notExpr = (SQLBinaryOpExpr) ((SQLNotExpr) expr).getExpr();
+            String left = notExpr.getLeft().toString();
+            SQLExpr right = notExpr.getRight();
+			// add a check here to see if the not'd value is a 'like' operator
+			Condition.OPEAR notOpear = notExpr.getOperator() == SQLBinaryOperator.Like ? Condition.OPEAR.NLIKE : Condition.OPEAR.N;
+			Condition condition = new Condition(CONN.valueOf(opear), left, notOpear, parseValue(right));
+			where.addWhere(condition);
         }
         else if (expr instanceof SQLMethodInvokeExpr) {
             SQLMethodInvokeExpr methodExpr = (SQLMethodInvokeExpr) expr;

src/main/java/org/nlpcn/es4sql/query/maker/Maker.java

@@ -21,7 +21,7 @@
 
 public abstract class Maker {
 
-	private static final Set<OPEAR> NOT_OPEAR_SET = Sets.newHashSet(OPEAR.N, OPEAR.NIN, OPEAR.ISN, OPEAR.NBETWEEN);
+	private static final Set<OPEAR> NOT_OPEAR_SET = Sets.newHashSet(OPEAR.N, OPEAR.NIN, OPEAR.ISN, OPEAR.NBETWEEN, OPEAR.NLIKE);
 
 	private boolean isQuery = false;
 
@@ -142,6 +142,7 @@ private ToXContent make(Condition cond, String name, Object value) throws SqlPar
 				break;
 			}
 		case LIKE:
+		case NLIKE:
 			String queryStr = ((String) value).replace('%', '*').replace('_', '?');
 			WildcardQueryBuilder wildcardQuery = QueryBuilders.wildcardQuery(name, queryStr);
 			x = isQuery ? wildcardQuery : FilterBuilders.queryFilter(wildcardQuery);