fix: revert to Semantic LOOKAHEAD for SubSelect in PrimaryExpression

- fixes #2242

Signed-off-by: Andreas Reichel <[email protected]>

Author: manticore-projects

build.gradle

@@ -637,8 +637,8 @@ check {
 
 jmh {
     includes = ['.*JSQLParserBenchmark.*']
-    warmupIterations = 3
+    warmupIterations = 2
     fork = 3
-    iterations = 10
+    iterations = 5
     timeOnIteration = '1s'
 }

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -5457,9 +5457,9 @@ Expression PrimaryExpression() #PrimaryExpression:
 
         | "{ts" token=<S_CHAR_LITERAL> "}" { retval = new TimestampValue(token.image); }
 
-        | LOOKAHEAD( 17 , { getAsBoolean(Feature.allowUnparenthesizedSubSelects) && !interrupted } ) retval=Select()
+        | LOOKAHEAD( Select() , { getAsBoolean(Feature.allowUnparenthesizedSubSelects) && !interrupted } ) retval=Select()
 
-        | LOOKAHEAD( 17 , { !getAsBoolean(Feature.allowUnparenthesizedSubSelects) && !interrupted } ) retval=ParenthesedSelect()
+        | LOOKAHEAD( ParenthesedSelect() , { !getAsBoolean(Feature.allowUnparenthesizedSubSelects) && !interrupted } ) retval=ParenthesedSelect()
 
         |
         (

src/test/java/net/sf/jsqlparser/benchmark/JSQLParserBenchmark.java

@@ -34,7 +34,7 @@ public class JSQLParserBenchmark {
     SqlParserRunner runner;
 
     // @Param({ "latest", "5.2", "5.1", "5.0", "4.9", "4.8", "4.7", "4.6", "4.5" })
-    @Param({"latest", "5.2", "5.1"})
+    @Param({"latest", "5.3", "5.1"})
     public String version;
 
     @Setup(Level.Trial)
@@ -83,7 +83,7 @@ public void parseSQLStatements(Blackhole blackhole) throws Exception {
         blackhole.consume(statements);
     }
 
-    @Benchmark
+    // @Benchmark
     public void parseQuotedText(Blackhole blackhole) throws Exception {
         String sqlStr = "SELECT ('\\'', 'a');\n"
                 + "INSERT INTO recycle_record (a,f) VALUES ('\\'anything', 'abc');\n"

src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java

@@ -6214,4 +6214,15 @@ public void testSelectAllColumnsFromFunctionReturnWithMultipleParentheses()
                 plainSelect.getSelectItems().get(0).toString());
     }
 
+    @Test
+    void testIssue2242SubSelectLookAhead() throws JSQLParserException {
+        String sqlStr = "INSERT INTO foo(col1, col2, col3, col4, col5, col6)\n"
+                + "      VALUES ( (SELECT blah FROM bar INNER JOIN bam ON bar.col1 = bam.col1 WHERE bar.id = ? AND et.id = ?), ?, ?, ?, ?, ?)\n"
+                + "      ON CONFLICT (id) DO UPDATE\n"
+                + "      SET col4 = ?, col5 = ?, col6 = ?";
+        Statement statement = CCJSqlParserUtil.parse(sqlStr);
+        System.out.println(statement.toString());
+        Insert insert = (Insert) statement;
+        Assertions.assertEquals("foo", insert.getTable().toString());
+    }
 }