TEIID-3315 fixing trim parsing

teiid · Jan 29, 2015 · f9494f3 · f9494f3
1 parent baf29e5
commit f9494f3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj b/engine/src/main/javacc/org/teiid/query/parser/SQLParser.jj
@@ -4234,7 +4234,7 @@ Expression function(ParseInfo info) :
 	   <LPAREN>
 	   { funcName = funcToken.image; funcToken = null; expression = null;}
 	   [
-	    LOOKAHEAD(2) (((funcToken = <LEADING>|
+	    LOOKAHEAD((<LEADING>|<TRAILING>|<BOTH>)|(expression(info)<FROM>)) (((funcToken = <LEADING>|
 	      funcToken = <TRAILING>|
 	      funcToken = <BOTH>)
 	    [expression = expression(info)])

diff --git a/engine/src/test/java/org/teiid/query/parser/TestParser.java b/engine/src/test/java/org/teiid/query/parser/TestParser.java
@@ -5252,5 +5252,11 @@ private void helpTestCompoundNonJoinCriteria(String sqlPred, PredicateCriteria p
     	query.setSelect(new Select(Arrays.asList(new Constant(1))));
         helpTest(sql, "SELECT 1", query);
     }
+
+    @Test public void testTrimExpression() throws QueryParserException {
+    	String sql = "select trim(substring(Description, pos1+1))";
+    	Query actualCommand = (Query)QueryParser.getQueryParser().parseCommand(sql, new ParseInfo());
+		assertEquals("SELECT trim(' ' FROM substring(Description, (pos1 + 1)))", actualCommand.toString());
+    }
 
 }