NLPchina#137 escaping underscore and percentage on like queries

eliranmoyal · eliranmoyal · commit 27d4ba8bd3de · 2016-01-16T11:14:49.000+02:00
diff --git a/src/main/java/org/nlpcn/es4sql/query/maker/Maker.java b/src/main/java/org/nlpcn/es4sql/query/maker/Maker.java
@@ -156,7 +156,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","_");
 			WildcardQueryBuilder wildcardQuery = QueryBuilders.wildcardQuery(name, queryStr);
 			x = isQuery ? wildcardQuery : FilterBuilders.queryFilter(wildcardQuery);
 			break;
diff --git a/src/test/java/org/nlpcn/es4sql/SqlParserTests.java b/src/test/java/org/nlpcn/es4sql/SqlParserTests.java
@@ -771,6 +771,15 @@ public void fieldsAsNumbersOnWhere() throws SqlParseException {
         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));
+        BoolFilterBuilder explan = FilterMaker.explan(select.getWhere());
+        String filterAsString = explan.toString();
+        Assert.assertTrue(filterAsString.contains("_hey?*%"));
+    }
+
 
     @Test
     public void complexNestedAndOtherQuery() throws SqlParseException {
