Merge origin/master

Author: wumpz

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

@@ -48,6 +48,7 @@ public class AnalyticExpression extends ASTNodeAccessImpl implements Expression
     private WindowElement windowElement;
     private KeepExpression keep = null;
     private AnalyticType type = AnalyticType.OVER;
+    private boolean distinct = false;
 
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
@@ -126,11 +127,22 @@ public void setType(AnalyticType type) {
         this.type = type;
     }
 
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
     @Override
     public String toString() {
         StringBuilder b = new StringBuilder();
 
         b.append(name).append("(");
+        if (isDistinct()) {
+            b.append("DISTINCT ");
+        }
         if (expression != null) {
             b.append(expression.toString());
             if (offset != null) {
@@ -146,7 +158,7 @@ public String toString() {
         if (keep != null) {
             b.append(keep.toString()).append(" ");
         }
-        
+
         switch (type) {
             case WITHIN_GROUP:
                 b.append("WITHIN GROUP");

src/main/java/net/sf/jsqlparser/statement/create/view/CreateView.java

@@ -38,6 +38,7 @@ public class CreateView implements Statement {
     private boolean orReplace = false;
     private List<String> columnNames = null;
     private boolean materialized = false;
+    private ForceOption force = ForceOption.NONE;
 
     @Override
     public void accept(StatementVisitor statementVisitor) {
@@ -98,12 +99,28 @@ public void setMaterialized(boolean materialized) {
         this.materialized = materialized;
     }
 
+    public ForceOption getForce() {
+        return force;
+    }
+
+    public void setForce(ForceOption force) {
+        this.force = force;
+    }
+
     @Override
     public String toString() {
         StringBuilder sql = new StringBuilder("CREATE ");
         if (isOrReplace()) {
             sql.append("OR REPLACE ");
         }
+        switch (force) {
+            case FORCE:
+                sql.append("FORCE ");
+                break;
+            case NO_FORCE:
+                sql.append("NO FORCE ");
+                break;
+        }
         if (isMaterialized()) {
             sql.append("MATERIALIZED ");
         }

src/main/java/net/sf/jsqlparser/statement/create/view/ForceOption.java

@@ -0,0 +1,34 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2018 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.statement.create.view;
+
+/**
+ *
+ * @author Tobias Warneke (t.warneke@gmx.net)
+ */
+public enum ForceOption {
+    NONE,
+    
+    FORCE,
+    
+    NO_FORCE
+}

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

@@ -56,6 +56,14 @@ public void deParse(CreateView createView) {
         if (createView.isOrReplace()) {
             buffer.append("OR REPLACE ");
         }
+        switch (createView.getForce()) {
+            case FORCE:
+                buffer.append("FORCE ");
+                break;
+            case NO_FORCE:
+                buffer.append("NO FORCE ");
+                break;
+        }
         if (createView.isMaterialized()) {
             buffer.append("MATERIALIZED ");
         }

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

@@ -604,6 +604,9 @@ public void visit(AnalyticExpression aexpr) {
         WindowElement windowElement = aexpr.getWindowElement();
 
         buffer.append(name).append("(");
+        if (aexpr.isDistinct()) {
+            buffer.append("DISTINCT ");
+        }
         if (expression != null) {
             expression.accept(this);
             if (offset != null) {

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

@@ -2616,10 +2616,14 @@ AnalyticExpression AnalyticExpression() :
     Expression defaultValue = null;
     WindowElement windowElement = null;
     KeepExpression keep = null;
+    boolean distinct = false;
 }
 {
     token=<S_IDENTIFIER> { retval.setName(token.image); }
-        "(" [ expr=SimpleExpression() ["," offset=SimpleExpression() ["," defaultValue=SimpleExpression() ]] | "*" { retval.setAllColumns(true); } ] ")" 
+        "(" [ 
+            [ <K_DISTINCT> {distinct = true;} ]
+            (expr=SimpleExpression() ["," offset=SimpleExpression() ["," defaultValue=SimpleExpression() ]] | "*" { retval.setAllColumns(true); } )
+            ] ")" 
 
     [ keep=KeepExpression() ]
 
@@ -2631,6 +2635,7 @@ AnalyticExpression AnalyticExpression() :
         [olist=OrderByElements() [windowElement = WindowElement() ] ]
 
     {
+        retval.setDistinct(distinct);
         retval.setExpression(expr);
         retval.setOffset(offset);
         retval.setDefaultValue(defaultValue);
@@ -3197,6 +3202,10 @@ CreateView CreateView():
 {
     <K_CREATE>
     [ <K_OR> <K_REPLACE> { createView.setOrReplace(true);} ]
+    [ 
+        <K_NO> <K_FORCE> { createView.setForce(ForceOption.NO_FORCE); } 
+        | <K_FORCE> { createView.setForce(ForceOption.FORCE); }
+    ]
     [ <K_MATERIALIZED> { createView.setMaterialized(true);} ]
     <K_VIEW> view=Table() { createView.setView(view); }
     [ columnNames = ColumnsNamesList() { createView.setColumnNames(columnNames); } ]

src/test/java/net/sf/jsqlparser/test/create/CreateViewTest.java

@@ -68,4 +68,20 @@ public void testCreateMaterializedView() throws JSQLParserException {
         String stmt = "CREATE MATERIALIZED VIEW view1 AS SELECT a, b FROM testtab";
         assertSqlCanBeParsedAndDeparsed(stmt);
     }
+    
+    public void testCreateForceView() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("CREATE FORCE VIEW view1 AS SELECT a, b FROM testtab");
+    }
+    
+    public void testCreateForceView1() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("CREATE NO FORCE VIEW view1 AS SELECT a, b FROM testtab");
+    }
+    
+    public void testCreateForceView2() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("CREATE OR REPLACE FORCE VIEW view1 AS SELECT a, b FROM testtab");
+    }
+    
+    public void testCreateForceView3() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("CREATE OR REPLACE NO FORCE VIEW view1 AS SELECT a, b FROM testtab");
+    }
 }

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

@@ -1618,6 +1618,11 @@ public void testAnalyticFunctionProblem1() throws JSQLParserException {
         String statement = "SELECT last_value(s.revenue_hold) OVER (PARTITION BY s.id_d_insertion_order, s.id_d_product_ad_attr, trunc(s.date_id, 'mm') ORDER BY s.date_id) AS col FROM s";
         assertSqlCanBeParsedAndDeparsed(statement);
     }
+    
+    public void testAnalyticFunction19() throws JSQLParserException {
+        String statement = "SELECT count(DISTINCT CASE WHEN client_organic_search_drop_flag = 1 THEN brand END) OVER (PARTITION BY client, category_1, category_2, category_3, category_4 ) AS client_brand_org_drop_count FROM sometable";
+        assertSqlCanBeParsedAndDeparsed(statement);
+    }
 
     public void testAnalyticFunctionProblem1b() throws JSQLParserException {
         String statement = "SELECT last_value(s.revenue_hold) OVER (PARTITION BY s.id_d_insertion_order, s.id_d_product_ad_attr, trunc(s.date_id, 'mm') ORDER BY s.date_id ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS col FROM s";