Fixes #1381 (#1383)

Allow Complex Expressions as SelectItem
JSQLParser · Nov 19, 2021 · cdf0f09 · cdf0f09
1 parent 60a7d10
commit cdf0f09
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -2022,8 +2022,8 @@ SelectExpressionItem SelectExpressionItem():
     Alias alias = null;
 }
 {
-      expression=Condition() { selectExpressionItem = new SelectExpressionItem(); selectExpressionItem.setExpression(expression); }
-             [alias=Alias() { selectExpressionItem.setAlias(alias); }] { return selectExpressionItem; }
+      expression=Expression() { selectExpressionItem = new SelectExpressionItem(); selectExpressionItem.setExpression(expression); }
+      [alias=Alias() { selectExpressionItem.setAlias(alias); }] { return selectExpressionItem; }
 }
 
 SelectItem SelectItem() #SelectItem:

diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
@@ -384,8 +384,6 @@ public void testLimit2() throws JSQLParserException {
         offset = ((PlainSelect) select.getSelectBody()).getLimit().getOffset();
         rowCount = ((PlainSelect) select.getSelectBody()).getLimit().getRowCount();
 
-        System.out.println(rowCount.getClass().getName());
-
         assertNull(offset);
         Assertions.assertTrue( rowCount instanceof AllValue);
 
@@ -4895,7 +4893,7 @@ public void testCaseElseExpressionIssue1375() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed(
                 "SELECT * FROM t1 WHERE CASE WHEN 1 = 1 THEN c1 = 'a' ELSE c2 = 'b' AND c4 = 'd' END", true);
     }
-  
+
     public void testComplexInExpressionIssue905() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed(
                 "select * " +
@@ -4922,4 +4920,19 @@ public void testComplexInExpressionIssue905() throws JSQLParserException {
                         "from table_a " +
                         "where (a, b, c) in ((1, 2, 3), (3, 4, 5))", true);
     }
+
+    @Test
+    public void testLogicalExpressionSelectItemIssue1381() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed(
+                "SELECT ( 1 + 1 ) = ( 1 + 2 )", true);
+
+        assertSqlCanBeParsedAndDeparsed(
+                "SELECT ( 1 = 1 ) = ( 1 = 2 )", true);
+
+        assertSqlCanBeParsedAndDeparsed(
+                "SELECT ( ( 1 = 1 ) AND ( 1 = 2 ) )", true);
+
+        assertSqlCanBeParsedAndDeparsed(
+                "SELECT ( 1 = 1 ) AND ( 1 = 2 )", true);
+    }
 }