Merge commit '0b15c46b4046230d02504f9059013a1cf3019969' into elastic2.0

eliranmoyal · eliranmoyal · commit eb6bc06b4547 · 2016-03-19T11:13: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,9 +140,9 @@ private ToXContent make(Condition cond, String name, Object value) throws SqlPar
 			}
 		case LIKE:
         case NLIKE:
-			String queryStr = ((String) value).replace("[%]","ESCAPEDPERCENTAGE").replace("[_]","ESCAPEDUNDERSCORE");
+			String queryStr = ((String) value);
             queryStr = queryStr.replace('%', '*').replace('_', '?');
-            queryStr = queryStr.replace("ESCAPEDPERCENTAGE","%").replace("ESCAPEDUNDERSCORE","_");
+            queryStr = queryStr.replace("&PERCENT","%").replace("&UNDERSCORE","_");
 			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
@@ -781,7 +781,7 @@ public void fieldsAsNumbersOnWhere() throws SqlParseException {
 
     @Test
     public void likeTestWithEscaped() throws SqlParseException {
-        String query = "select * from x where name like '[_]hey_%[%]'";
+        String query = "select * from x where name like '&UNDERSCOREhey_%&PERCENT'";
         Select select = parser.parseSelect((SQLQueryExpr) queryToExpr(query));
         BoolQueryBuilder explan = QueryMaker.explan(select.getWhere());
         String filterAsString = explan.toString();
