fixes #375

fixes #371

Author: wumpz

src/main/java/net/sf/jsqlparser/expression/ExpressionVisitor.java

@@ -172,4 +172,6 @@ public interface ExpressionVisitor {
 
     void visit(DateTimeLiteralExpression literal);
 
+    public void visit(NotExpression aThis);
+
 }

src/main/java/net/sf/jsqlparser/expression/ExpressionVisitorAdapter.java

@@ -341,6 +341,11 @@ public void visit(MultiExpressionList multiExprList) {
         }
     }
 
+    @Override
+    public void visit(NotExpression notExpr) {
+        notExpr.getExpression().accept(this);
+    }
+
     protected void visitBinaryExpression(BinaryExpression expr) {
         expr.getLeftExpression().accept(this);
         expr.getRightExpression().accept(this);

src/main/java/net/sf/jsqlparser/expression/NotExpression.java

@@ -0,0 +1,52 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2017 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as 
+ * published by the Free Software Foundation, either version 2.1 of the 
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public 
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.expression;
+
+/**
+ * It represents a "-" or "+" before an expression
+ */
+public class NotExpression implements Expression {
+
+	private Expression expression;
+
+	public NotExpression(Expression expression) {
+		setExpression(expression);
+	}
+    
+	public Expression getExpression() {
+		return expression;
+	}
+
+	public final void setExpression(Expression expression) {
+		this.expression = expression;
+	}
+
+	@Override
+	public void accept(ExpressionVisitor expressionVisitor) {
+		expressionVisitor.visit(this);
+	}
+
+	@Override
+	public String toString() {
+		return "NOT " + expression.toString();
+	}
+}

src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java

@@ -282,6 +282,11 @@ public void visit(Subtraction subtraction) {
         visitBinaryExpression(subtraction);
     }
 
+    @Override
+    public void visit(NotExpression notExpr) {
+        notExpr.getExpression().accept(this);
+    }
+
     public void visitBinaryExpression(BinaryExpression binaryExpression) {
         binaryExpression.getLeftExpression().accept(this);
         binaryExpression.getRightExpression().accept(this);

src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java

@@ -118,6 +118,12 @@ public void visit(HexValue hexValue) {
         buffer.append(hexValue.toString());
     }
 
+    @Override
+    public void visit(NotExpression notExpr) {
+        buffer.append(NOT);
+        notExpr.getExpression().accept(this);
+    }
+
     public void visitOldOracleJoinBinaryExpression(OldOracleJoinBinaryExpression expression, String operator) {
         if (expression.isNot()) {
             buffer.append(NOT);

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

@@ -1691,6 +1691,7 @@ Expression Condition():
 	(LOOKAHEAD(SQLCondition()) result=SQLCondition()
 	| LOOKAHEAD(RegularCondition()) result=RegularCondition()
 	| LOOKAHEAD(Function()) result=Function()
+	| <K_NOT> result=Column() { result = new NotExpression(result); }
     | result=Column()
 	| LOOKAHEAD({ "0".equals(getToken(1).image) || "1".equals(getToken(1).image) }) token=<S_LONG> { result = new LongValue(token.image); }
 	)
@@ -2433,8 +2434,8 @@ Expression CaseWhenExpression() #CaseWhenExpression:
     	    ( clause=WhenThenSearchCondition() { whenClauses.add(clause); } )+
              [<K_ELSE> elseExp=SimpleExpression()]
 		|
-		    switchExp=PrimaryExpression()
-             ( clause=WhenThenValue() { whenClauses.add(clause); } )*
+		    (LOOKAHEAD(RegularCondition()) switchExp=RegularCondition() | switchExp=BitwiseAndOr())
+             ( clause=WhenThenValue() { whenClauses.add(clause); } )+
              [<K_ELSE> elseExp=SimpleExpression()]
 	)
     <K_END>

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

@@ -941,6 +941,14 @@ public void testCase() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed(statement);
 
     }
+    
+    public void testIssue371SimplifiedCase() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT CASE col + 4 WHEN 2 THEN 1 ELSE 0 END");
+    }
+    
+    public void testIssue371SimplifiedCase2() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT CASE col > 4 WHEN true THEN 1 ELSE 0 END");
+    }
 
     public void testReplaceAsFunction() throws JSQLParserException {
         String statement = "SELECT REPLACE(a, 'b', c) FROM tab1";
@@ -2281,4 +2289,16 @@ public void testProblemKeywordCommitIssue341() throws JSQLParserException {
     public void testProblemIsIssue331() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT C_DocType.C_DocType_ID,NULL,COALESCE(C_DocType_Trl.Name,C_DocType.Name) AS Name,C_DocType.IsActive FROM C_DocType LEFT JOIN C_DocType_TRL ON (C_DocType.C_DocType_ID=C_DocType_Trl.C_DocType_ID AND C_DocType_Trl.AD_Language='es_AR') WHERE C_DocType.AD_Client_ID=1010016 AND C_DocType.AD_Client_ID IN (0,1010016) AND C_DocType.c_doctype_id in ( select c_doctype2.c_doctype_id from c_doctype as c_doctype2 where substring( c_doctype2.printname,6, length(c_doctype2.printname) ) = ( select letra from c_letra_comprobante as clc where clc.c_letra_comprobante_id = 1010039) ) AND ( (1010094!=0 AND C_DocType.ad_org_id = 1010094) OR 1010094=0 ) ORDER BY 3 LIMIT 2000", true);
     }
+    
+    public void testProblemIssue375() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("select n.nspname, c.relname, a.attname, a.atttypid, t.typname, a.attnum, a.attlen, a.atttypmod, a.attnotnull, c.relhasrules, c.relkind, c.oid, pg_get_expr(d.adbin, d.adrelid), case t.typtype when 'd' then t.typbasetype else 0 end, t.typtypmod, c.relhasoids from (((pg_catalog.pg_class c inner join pg_catalog.pg_namespace n on n.oid = c.relnamespace and c.relname = 'business' and n.nspname = 'public') inner join pg_catalog.pg_attribute a on (not a.attisdropped) and a.attnum > 0 and a.attrelid = c.oid) inner join pg_catalog.pg_type t on t.oid = a.atttypid) left outer join pg_attrdef d on a.atthasdef and d.adrelid = a.attrelid and d.adnum = a.attnum order by n.nspname, c.relname, attnum", true);
+    }
+    
+    public void testProblemIssue375Simplified() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("select * from (((pg_catalog.pg_class c inner join pg_catalog.pg_namespace n on n.oid = c.relnamespace and c.relname = 'business' and n.nspname = 'public') inner join pg_catalog.pg_attribute a on (not a.attisdropped) and a.attnum > 0 and a.attrelid = c.oid) inner join pg_catalog.pg_type t on t.oid = a.atttypid) left outer join pg_attrdef d on a.atthasdef and d.adrelid = a.attrelid and d.adnum = a.attnum order by n.nspname, c.relname, attnum", true);
+    }
+    
+    public void testProblemIssue375Simplified2() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("select * from (pg_catalog.pg_class c inner join pg_catalog.pg_namespace n on n.oid = c.relnamespace and c.relname = 'business' and n.nspname = 'public') inner join pg_catalog.pg_attribute a on (not a.attisdropped) and a.attnum > 0 and a.attrelid = c.oid", true);
+    }
 }