feat: allow EXTRACT to be parsed as regular function also

manticore-projects · manticore-projects · commit b85dc2fd0004 · 2024-04-16T13:01:05.000+07:00
- fixes object_access01.sql - fixes #1992 Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -4346,7 +4346,7 @@ Expression PrimaryExpression() #PrimaryExpression:
 
         | LOOKAHEAD(2, {!interrupted}) retval=NumericBind()
 
-        | LOOKAHEAD(3, {!interrupted}) retval=ExtractExpression()
+        | LOOKAHEAD( ExtractExpression() , {!interrupted}) retval=ExtractExpression()
 
         | LOOKAHEAD(3) retval=MySQLGroupConcat()
 
diff --git a/src/test/java/net/sf/jsqlparser/expression/ExtractExpressionTest.java b/src/test/java/net/sf/jsqlparser/expression/ExtractExpressionTest.java
@@ -0,0 +1,15 @@
+package net.sf.jsqlparser.expression;
+
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.test.TestUtils;
+import org.junit.jupiter.api.Test;
+
+class ExtractExpressionTest {
+
+    @Test
+    void testRegularFunctionCall() throws JSQLParserException {
+        String sqlStr = "select extract(engine_full, '''(.*?)''')";
+        TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+
+    }
+}
diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SpecialOracleTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SpecialOracleTest.java
@@ -99,7 +99,7 @@ public class SpecialOracleTest {
             "join21.sql", "keywordasidentifier01.sql", "keywordasidentifier02.sql",
             "keywordasidentifier03.sql", "keywordasidentifier04.sql", "keywordasidentifier05.sql",
             "lexer02.sql", "lexer03.sql", "lexer04.sql", "lexer05.sql", "like01.sql", "merge01.sql",
-            "merge02.sql", "merge03.sql", "merge04.sql", "order_by01.sql", "order_by02.sql",
+            "merge02.sql", "merge03.sql", "merge04.sql", "object_access01.sql", "order_by01.sql", "order_by02.sql",
             "order_by03.sql", "order_by04.sql",
             "order_by05.sql", "order_by06.sql", "pivot01.sql", "pivot02.sql", "pivot03.sql",
             "pivot04.sql", "pivot05.sql", "pivot06.sql", "pivot07.sql", "pivot07_Parenthesis.sql",
diff --git a/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/object_access01.sql b/src/test/resources/net/sf/jsqlparser/statement/select/oracle-tests/object_access01.sql
@@ -26,4 +26,5 @@ table
 ) t
 
 
---@FAILURE: Encountered unexpected token: "(" "(" recorded first on Aug 3, 2021, 7:20:07 AM
+--@FAILURE: Encountered unexpected token: "(" "(" recorded first on Aug 3, 2021, 7:20:07 AM
+--@SUCCESSFULLY_PARSED_AND_DEPARSED first on 16 Apr 2024, 12:57:31
