bugfix #720 #991: supporting SELECT "conditions" (#1032)

* bugfix issue #1020: JSON type in MySQL not supported in v3.2

* bugfix issue #720 #991: supporting SELECT "CONDITIONS"

Author: mo3000

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

@@ -8,8 +8,8 @@
  * #L%
  */
 
-options{
-    IGNORE_CASE = true ;
+options {
+    IGNORE_CASE = true;
     STATIC = false;
     DEBUG_PARSER = false;
     DEBUG_LOOKAHEAD = false;
@@ -975,7 +975,7 @@ List<SelectExpressionItem> ListExpressionItem():
 }
 {
    item = SelectExpressionItem() {retval.add(item);}
-   ("," item = SelectExpressionItem() {retval.add(item);} )*
+   (<K_COMMA> item = SelectExpressionItem() {retval.add(item);} )*
    { return retval; }
 }
 
@@ -1636,7 +1636,7 @@ SelectExpressionItem SelectExpressionItem():
     Alias alias = null;
 }
 {
-     expression=SimpleExpression() { selectExpressionItem = new SelectExpressionItem(); selectExpressionItem.setExpression(expression); }
+      expression=Condition() { selectExpressionItem = new SelectExpressionItem(); selectExpressionItem.setExpression(expression); }
              [alias=Alias() { selectExpressionItem.setAlias(alias); }] { return selectExpressionItem; }
 }
 
@@ -1785,11 +1785,22 @@ List<SelectExpressionItem> PivotSingleInItems():
    SelectExpressionItem item;
 }
 {
-   item = SelectExpressionItem() {retval.add(item);}
-   ("," item = SelectExpressionItem() {retval.add(item);} )*
+   item = PivotSelectExprItem() {retval.add(item);}
+   ("," item = PivotSelectExprItem() {retval.add(item);} )*
    { return retval; }
 }
 
+SelectExpressionItem PivotSelectExprItem():
+{
+    SelectExpressionItem selectExpressionItem = null;
+    Expression expression = null;
+    Alias alias = null;
+}
+{
+      expression=SimpleExpression() { selectExpressionItem = new SelectExpressionItem(); selectExpressionItem.setExpression(expression); }
+             [alias=Alias() { selectExpressionItem.setAlias(alias); }] { return selectExpressionItem; }
+}
+
 ExpressionListItem ExpressionListItem():
 {
     ExpressionListItem expressionListItem = null;
@@ -1957,12 +1968,12 @@ FromItem FromItem():
                 (
                     indexHint = MySQLIndexHint() {
                         if (fromItem instanceof Table)
-                                                    ((Table) fromItem).setHint(indexHint);
+                            ((Table) fromItem).setHint(indexHint);
                     }
                     |
                     sqlServerHints = SQLServerHints() {
                         if (fromItem instanceof Table)
-                                                    ((Table) fromItem).setSqlServerHints(sqlServerHints);
+                            ((Table) fromItem).setSqlServerHints(sqlServerHints);
                     }
                 )
             ]

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

@@ -21,6 +21,8 @@
 import net.sf.jsqlparser.statement.*;
 import static net.sf.jsqlparser.test.TestUtils.*;
 import org.apache.commons.io.IOUtils;
+
+import static net.sf.jsqlparser.test.TestUtils.assertSqlCanBeParsedAndDeparsed;
 import static org.assertj.core.api.Assertions.assertThat;
 import java.io.IOException;
 import java.io.StringReader;
@@ -4272,4 +4274,16 @@ public void testKeyWordOfIssue1029() throws JSQLParserException {
     public void testKeyWordExceptIssue1026() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT * FROM xxx WHERE exclude = 1");
     }
+
+    @Test
+    public void testSelectConditionsIssue720And991() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT column IS NOT NULL FROM table");
+        assertSqlCanBeParsedAndDeparsed("SELECT 0 IS NULL");
+        assertSqlCanBeParsedAndDeparsed("SELECT 1 + 2");
+        assertSqlCanBeParsedAndDeparsed("SELECT 1 < 2");
+        assertSqlCanBeParsedAndDeparsed("SELECT 1 > 2");
+        assertSqlCanBeParsedAndDeparsed("SELECT 1 + 2 AS a, 3 < 4 AS b");
+        assertSqlCanBeParsedAndDeparsed("SELECT 1 < 2 AS a, 0 IS NULL AS b");
+//        assertSqlCanBeParsedAndDeparsed("SELECT 1 < 2 AS a, (0 IS NULL) AS b");
+    }
 }