Partial support construct tuple as simple expression (#1107)

SELECT (1,2)
JSQLParser · Jan 31, 2021 · 2065fed · 2065fed
1 parent f2e74f1
commit 2065fed
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -3281,6 +3281,7 @@ Expression PrimaryExpression() #PrimaryExpression:
     boolean exclamationMarkNot = false;
     boolean dateExpressionAllowed = true;
     Expression idxExpr;
+    ExpressionList list;
 }
 {
     [ <K_NOT> { not=true; } | "!" { not=true; exclamationMarkNot=true; } ]
@@ -3341,7 +3342,14 @@ Expression PrimaryExpression() #PrimaryExpression:
 
         | LOOKAHEAD("(" retval=SubSelect() ")") "(" retval=SubSelect() ")"
 
-        | "(" retval=SimpleExpression() ")" {retval = new Parenthesis(retval); }
+        | "(" list = SimpleExpressionList() ")"
+          {
+              if (list.getExpressions().size() == 1) {
+                  retval = new Parenthesis(list.getExpressions().get(0));
+              } else {
+                  retval = new RowConstructor().withExprList(list);
+              }
+          }
     )
 
     [

diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
@@ -4441,4 +4441,9 @@ public void testSignedKeywordIssue1100() throws JSQLParserException {
     public void testSignedKeywordIssue995() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT leading FROM prd_reprint");
     }
+
+    @Test
+    public void testSelectTuple() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT hyperloglog_distinct((1, 2)) FROM t");
+    }
 }