fixes #850

Author: wumpz

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

@@ -2265,14 +2265,15 @@ Expression AndExpression() :
 {
     Expression left, right, result;
     boolean not = false;
+	boolean exclamationMarkNot=false;
 }
 {
     (
     LOOKAHEAD(Condition())
         left=Condition()
         |
-        [ <K_NOT> { not = true; } ]
-        "(" left=OrExpression() ")" {left = new Parenthesis(left); if (not) { left = new NotExpression(left); not = false; } }
+        [ <K_NOT> { not=true; } | "!" { not=true; exclamationMarkNot=true; } ]
+        "(" left=OrExpression() ")" {left = new Parenthesis(left); if (not) { left = new NotExpression(left, exclamationMarkNot); not = false; } }
     )
     { result = left; }
 
@@ -2282,8 +2283,8 @@ Expression AndExpression() :
         LOOKAHEAD(Condition())
             right=Condition()
             |
-            [ <K_NOT> { not = true; } ]
-            "(" right=OrExpression() ")" {right = new Parenthesis(right); if (not) { right = new NotExpression(right); not = false; } }
+            [ <K_NOT> { not=true; } | "!" { not=true; exclamationMarkNot=true; } ]
+            "(" right=OrExpression() ")" {right = new Parenthesis(right); if (not) { right = new NotExpression(right, exclamationMarkNot); not = false; } }
         )
         {
             result = new AndExpression(left, right);
@@ -2300,16 +2301,17 @@ Expression Condition():
     Expression result;
     Token token;
     boolean not = false;
+	boolean exclamationMarkNot = false;
 }
 {
-    [ LOOKAHEAD(2) <K_NOT> { not = true; }]
+    [ LOOKAHEAD(2) (<K_NOT> { not=true; } | "!" { not=true; exclamationMarkNot=true; })]
     (
         LOOKAHEAD(SQLCondition()) result=SQLCondition()
         | LOOKAHEAD(RegularCondition()) result=RegularCondition()
         | result=SimpleExpression()
     )
 
-    { return not?new NotExpression(result):result; }
+    { return not?new NotExpression(result, exclamationMarkNot):result; }
 }
 
 Expression RegularCondition() #RegularCondition:

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

@@ -3531,6 +3531,17 @@ public void testNotVariant3() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT NOT (1 + 1)");
     }
 
+    @Test
+    public void testNotVariant4() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable WHERE NOT (1 = 1)");
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable WHERE ! (1 = 1)");
+    }
+
+    @Test
+    public void testNotVariantIssue850() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable WHERE id = 1 AND ! (id = 1 AND id = 2)");
+    }
+
     @Test
     public void testDateArithmentic() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT CURRENT_DATE + (1 DAY) FROM SYSIBM.SYSDUMMY1");