Merge commit '27d4ba8bd3de0c4f6bb1e15ec7cbefa21eb9093f' into elastic2.0

eliranmoyal · eliranmoyal · commit a5f647dced2f · 2016-03-18T18:26:45.000+02:00
Conflicts:
	src/main/java/org/nlpcn/es4sql/query/maker/Maker.java
diff --git a/src/main/java/org/nlpcn/es4sql/query/maker/Maker.java b/src/main/java/org/nlpcn/es4sql/query/maker/Maker.java
@@ -140,7 +140,9 @@ private ToXContent make(Condition cond, String name, Object value) throws SqlPar
 			}
 		case LIKE:
         case NLIKE:
-			String queryStr = ((String) value).replace('%', '*').replace('_', '?');
+			String queryStr = ((String) value).replace("[%]","ESCAPEDPERCENTAGE").replace("[_]","ESCAPEDUNDERSCORE");
+            queryStr = queryStr.replace('%', '*').replace('_', '?');
+            queryStr = queryStr.replace("ESCAPEDPERCENTAGE","%").replace("ESCAPEDUNDERSCORE","_");
 			x = QueryBuilders.wildcardQuery(name, queryStr);
 			break;
 		case GT:
diff --git a/src/test/java/org/nlpcn/es4sql/SqlParserTests.java b/src/test/java/org/nlpcn/es4sql/SqlParserTests.java
@@ -4,6 +4,7 @@
 import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
 import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
 import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
+import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -15,6 +16,7 @@
 import org.nlpcn.es4sql.parse.FieldMaker;
 import org.nlpcn.es4sql.parse.ScriptFilter;
 import org.nlpcn.es4sql.parse.SqlParser;
+import org.nlpcn.es4sql.query.maker.QueryMaker;
 
 import java.io.IOException;
 import java.sql.SQLFeatureNotSupportedException;
@@ -529,7 +531,7 @@ public void nestedFieldOnWhereNoPathSimpleField() throws SqlParseException {
         Where where = select.getWhere().getWheres().get(0);
         Assert.assertTrue("where should be condition", where instanceof Condition);
         Condition condition = (Condition) where;
-        Assert.assertTrue("condition should be nested",condition.isNested());
+        Assert.assertTrue("condition should be nested", condition.isNested());
         Assert.assertEquals("message",condition.getNestedPath());
         Assert.assertEquals("message.name",condition.getName());
     }
@@ -701,7 +703,7 @@ public void termsWithStringTest() throws SqlParseException {
         Condition condition = (Condition) select.getWhere().getWheres().get(0);
         Object[] values = (Object[]) condition.getValue();
         Assert.assertEquals("a",values[0]);
-        Assert.assertEquals("b",values[1]);
+        Assert.assertEquals("b", values[1]);
     }
 
     @Test
@@ -763,11 +765,20 @@ public void fieldsAsNumbersOnWhere() throws SqlParseException {
         LinkedList<Where> wheres = select.getWhere().getWheres();
         Assert.assertEquals(1, wheres.size());
         Where where = wheres.get(0);
-        Assert.assertEquals(Condition.class,where.getClass());
+        Assert.assertEquals(Condition.class, where.getClass());
         Condition condition = (Condition) where;
         Assert.assertEquals("3", condition.getName());
     }
 
+    @Test
+    public void likeTestWithEscaped() throws SqlParseException {
+        String query = "select * from x where name like '[_]hey_%[%]'";
+        Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
+        BoolQueryBuilder explan = QueryMaker.explan(select.getWhere());
+        String filterAsString = explan.toString();
+        Assert.assertTrue(filterAsString.contains("_hey?*%"));
+    }
+
 
     @Test
     public void complexNestedAndOtherQuery() throws SqlParseException {
