Merge Master

Author: manticore-projects

.github/release.yml

@@ -0,0 +1,8 @@
+changelog:
+  categories:
+    - title: Bugs solved
+      labels:
+        - "bug"  
+    - title: Changes and new Features
+      labels:
+        - "*"

README.md

@@ -54,26 +54,16 @@ To help JSqlParser's development you are encouraged to provide
 
 Any requests for examples or any particular documentation will be most welcome.
 
-## Extensions in the latest SNAPSHOT version 4.5
+## Extensions in the latest SNAPSHOT version 4.6
+
+* support for named windows in window expressions: `SELECT sum(c) OVER winName FROM mytable WINDOW winName AS (PARTITION BY pcol)`
 
 Additionally, we have fixed many errors and improved the code quality and the test coverage.
 
 ## Extensions of JSqlParser releases
 
 * [Release Notes](https://github.com/JSQLParser/JSqlParser/releases)
 * Modifications before GitHub's release tagging are listed in the [Older Releases](https://github.com/JSQLParser/JSqlParser/wiki/Older-Releases) page.
-* UnsupportedStatement support instead of throwing Exceptions
-* support for **RETURNING** clause of a **DELETE** statement
-* Add support for `... ALTER COLUMN ... DROP DEFAULT`
-* `INSERT` supports `SetOperations` (e. g. `INSERT INTO ... SELECT ... FROM ... UNION SELECT ... FROM ...`), those `SetOperations` are used both for `SELECT` and `VALUES` clauses (API change) in order to simplify the Grammar
-* `(WITH ... SELECT ...)` statements within brackets are now supported
-* Postgres `NATURAL { INNER | LEFT | RIGHT } JOIN` support
-* extended support for Hive dialect `GROUPING SETS`
-* support for Postgresql **drop** function
-* support table option **character set** and **index** options
-* support Postgresql optional **TABLE** in **TRUNCATE**
-* support for `ANALYZE mytable`
-
 
 ## Building from the sources
 

build.gradle

@@ -168,15 +168,15 @@ spotbugsMain {
 
 spotbugs {
     // fail only on P1 and without the net.sf.jsqlparser.parser.*
-    excludeFilter = file("spotBugsExcludeFilter.xml")
+    excludeFilter = file("config/spotbugs/spotBugsExcludeFilter.xml")
 
     // do not run over the test, although we should do that eventually
      spotbugsTest.enabled = false
 }
 
 pmd {
     consoleOutput = false
-    toolVersion = "6.44.0"
+    toolVersion = "6.46.0"
 
     sourceSets = [sourceSets.main]
 
@@ -185,7 +185,7 @@ pmd {
 
     //rulesMinimumPriority = 1
 
-    ruleSetFiles = files("ruleset.xml")
+    ruleSetFiles = files("config/pmd/ruleset.xml")
 
     pmdMain {
         excludes = [

eclipse-java-google-style.xml renamed to config/formatter/eclipse-java-google-style.xml

@@ -66,8 +66,17 @@ under the License.
 	<rule ref="category/java/design.xml/SimplifiedTernary" />
 	<rule ref="category/java/design.xml/UselessOverridingMethod" />
 	<rule ref="category/java/design.xml/AvoidThrowingNullPointerException" />
-    
-    <!-- for Codazy -->
+
+	<!--
+	<rule ref="category/java/design.xml/NPathComplexity">
+		<properties>
+			<property name="reportLevel" value="200" />
+		</properties>
+	</rule>
+	-->
+
+
+	<!-- for Codazy -->
 	<rule ref="category/java/design.xml/CyclomaticComplexity" />
 	<rule ref="category/java/design.xml/ExcessiveMethodLength" />
 	<rule ref="category/java/bestpractices.xml/SwitchStmtsShouldHaveDefault" />

ruleset.xml renamed to config/pmd/ruleset.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.jsqlparser</groupId>
     <artifactId>jsqlparser</artifactId>
-    <version>4.5-SNAPSHOT</version>
+    <version>4.6-SNAPSHOT</version>
     <name>JSQLParser library</name> 
     <inceptionYear>2004</inceptionYear>
     <organization>
@@ -121,7 +121,7 @@
                 <configuration>
                     <rulesets>
                         <!-- Custom local file system rule set -->
-                        <ruleset>${project.basedir}/ruleset.xml</ruleset>
+                        <ruleset>${project.basedir}/config/pmd/ruleset.xml</ruleset>
                     </rulesets>
                     <excludes>
                         <exclude>**/*Bean.java</exclude>
@@ -625,7 +625,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <pmdVersion>6.36.0</pmdVersion>
+        <pmdVersion>6.46.0</pmdVersion>
     </properties>
 
     <description>JSqlParser parses an SQL statement and translate it into a hierarchy of Java classes.

spotBugsExcludeFilter.xml renamed to config/spotbugs/spotBugsExcludeFilter.xml

@@ -16,17 +16,14 @@
 import net.sf.jsqlparser.statement.select.OrderByElement;
 
 /**
- * Analytic function. The name of the function is variable but the parameters following the special
- * analytic function path. e.g. row_number() over (order by test). Additional there can be an
- * expression for an analytical aggregate like sum(col) or the "all collumns" wildcard like
- * count(*).
+ * Analytic function. The name of the function is variable but the parameters following the special analytic function
+ * path. e.g. row_number() over (order by test). Additional there can be an expression for an analytical aggregate like
+ * sum(col) or the "all collumns" wildcard like count(*).
  *
  * @author tw
  */
 public class AnalyticExpression extends ASTNodeAccessImpl implements Expression {
 
-    private final OrderByClause orderBy = new OrderByClause();
-    private final PartitionByClause partitionBy = new PartitionByClause();
     private String name;
     private Expression expression;
     private Expression offset;
@@ -39,8 +36,9 @@ public class AnalyticExpression extends ASTNodeAccessImpl implements Expression
     private boolean ignoreNulls = false;            //IGNORE NULLS inside function parameters
     private boolean ignoreNullsOutside = false;     //IGNORE NULLS outside function parameters
     private Expression filterExpression = null;
-    private WindowElement windowElement = null;
     private List<OrderByElement> funcOrderBy = null;
+    private String windowName = null;               // refers to an external window definition (paritionBy, orderBy, windowElement)
+    private WindowDefinition windowDef = new WindowDefinition();
 
     public AnalyticExpression() {
     }
@@ -76,11 +74,11 @@ public void accept(ExpressionVisitor expressionVisitor) {
     }
 
     public List<OrderByElement> getOrderByElements() {
-        return orderBy.getOrderByElements();
+        return windowDef.orderBy.getOrderByElements();
     }
 
     public void setOrderByElements(List<OrderByElement> orderByElements) {
-        orderBy.setOrderByElements(orderByElements);
+        windowDef.orderBy.setOrderByElements(orderByElements);
     }
 
     public KeepExpression getKeep() {
@@ -92,19 +90,19 @@ public void setKeep(KeepExpression keep) {
     }
 
     public ExpressionList getPartitionExpressionList() {
-        return partitionBy.getPartitionExpressionList();
+        return windowDef.partitionBy.getPartitionExpressionList();
     }
 
     public void setPartitionExpressionList(ExpressionList partitionExpressionList) {
         setPartitionExpressionList(partitionExpressionList, false);
     }
 
     public void setPartitionExpressionList(ExpressionList partitionExpressionList, boolean brackets) {
-        partitionBy.setPartitionExpressionList(partitionExpressionList, brackets);
+        windowDef.partitionBy.setPartitionExpressionList(partitionExpressionList, brackets);
     }
 
     public boolean isPartitionByBrackets() {
-        return partitionBy.isBrackets();
+        return windowDef.partitionBy.isBrackets();
     }
 
     public String getName() {
@@ -140,11 +138,11 @@ public void setDefaultValue(Expression defaultValue) {
     }
 
     public WindowElement getWindowElement() {
-        return windowElement;
+        return windowDef.windowElement;
     }
 
     public void setWindowElement(WindowElement windowElement) {
-        this.windowElement = windowElement;
+        windowDef.windowElement = windowElement;
     }
 
     public AnalyticType getType() {
@@ -187,6 +185,22 @@ public void setIgnoreNullsOutside(boolean ignoreNullsOutside) {
         this.ignoreNullsOutside = ignoreNullsOutside;
     }
 
+    public String getWindowName() {
+        return windowName;
+    }
+
+    public void setWindowName(String windowName) {
+        this.windowName = windowName;
+    }
+
+    public WindowDefinition getWindowDefinition() {
+        return windowDef;
+    }
+
+    public void setWindowDefinition(WindowDefinition windowDef) {
+        this.windowDef = windowDef;
+    }
+
     @Override
     @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity", "PMD.MissingBreakInSwitch"})
     public String toString() {
@@ -210,11 +224,11 @@ public String toString() {
         if (isIgnoreNulls()) {
             b.append(" IGNORE NULLS");
         }
-        if (funcOrderBy!=null) {
+        if (funcOrderBy != null) {
             b.append(" ORDER BY ");
-            b.append( funcOrderBy.stream().map(OrderByElement::toString).collect(joining(", ")));
+            b.append(funcOrderBy.stream().map(OrderByElement::toString).collect(joining(", ")));
         }
-        
+
         b.append(") ");
         if (keep != null) {
             b.append(keep.toString()).append(" ");
@@ -232,7 +246,7 @@ public String toString() {
         if (isIgnoreNullsOutside()) {
             b.append("IGNORE NULLS ");
         }
-        
+
         switch (type) {
             case FILTER_ONLY:
                 return b.toString();
@@ -242,20 +256,14 @@ public String toString() {
             default:
                 b.append("OVER");
         }
-        b.append(" (");
 
-        partitionBy.toStringPartitionBy(b);
-        orderBy.toStringOrderByElements(b);
-
-        if (windowElement != null) {
-            if (orderBy.getOrderByElements() != null) {
-                b.append(' ');
-            }
-            b.append(windowElement);
+        if (windowName != null) {
+            b.append(" ").append(windowName);
+        } else {
+            b.append(" ");
+            b.append(windowDef.toString());
         }
 
-        b.append(")");
-
         return b.toString();
     }
 

pom.xml

@@ -0,0 +1,83 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2022 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.expression;
+
+import java.util.List;
+import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.statement.select.OrderByElement;
+
+public class WindowDefinition {
+
+    final OrderByClause orderBy = new OrderByClause();
+    final PartitionByClause partitionBy = new PartitionByClause();
+    WindowElement windowElement = null;
+    private String windowName;
+
+    public WindowElement getWindowElement() {
+        return windowElement;
+    }
+
+    public void setWindowElement(WindowElement windowElement) {
+        this.windowElement = windowElement;
+    }
+
+    public List<OrderByElement> getOrderByElements() {
+        return orderBy.getOrderByElements();
+    }
+
+    public void setOrderByElements(List<OrderByElement> orderByElements) {
+        orderBy.setOrderByElements(orderByElements);
+    }
+
+    public ExpressionList getPartitionExpressionList() {
+        return partitionBy.getPartitionExpressionList();
+    }
+
+    public void setPartitionExpressionList(ExpressionList partitionExpressionList) {
+        setPartitionExpressionList(partitionExpressionList, false);
+    }
+
+    public void setPartitionExpressionList(ExpressionList partitionExpressionList, boolean brackets) {
+        partitionBy.setPartitionExpressionList(partitionExpressionList, brackets);
+    }
+
+    public String getWindowName() {
+        return windowName;
+    }
+
+    public void setWindowName(String windowName) {
+        this.windowName = windowName;
+    }
+    
+    public WindowDefinition withWindowName(String windowName) {
+        setWindowName(windowName);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder b = new StringBuilder();
+        if (windowName != null) {
+            b.append(windowName).append(" AS ");
+        }
+        b.append("(");
+        partitionBy.toStringPartitionBy(b);
+        orderBy.toStringOrderByElements(b);
+
+        if (windowElement != null) {
+            if (orderBy.getOrderByElements() != null) {
+                b.append(' ');
+            }
+            b.append(windowElement);
+        }
+        b.append(")");
+        return b.toString();
+    }
+}

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

@@ -32,12 +32,21 @@ public P withAllowComplexParsing(boolean allowComplexParsing) {
     public P withUnsupportedStatements(boolean allowUnsupportedStatements) {
         return withFeature(Feature.allowUnsupportedStatements, allowUnsupportedStatements);
     }
+
+    public P withTimeOut(int timeOutMillSeconds) {
+        return withFeature(Feature.timeOut, timeOutMillSeconds);
+    }
 
     public P withFeature(Feature f, boolean enabled) {
         getConfiguration().setValue(f, enabled);
         return me();
     }
 
+    public P withFeature(Feature f, int value) {
+        getConfiguration().setValue(f, value);
+        return me();
+    }
+
     public abstract FeatureConfiguration getConfiguration();
 
     public abstract P me();
@@ -46,6 +55,10 @@ public boolean getAsBoolean(Feature f) {
         return getConfiguration().getAsBoolean(f);
     }
 
+    public Integer getAsInteger(Feature f) {
+        return getConfiguration().getAsInteger(f);
+    }
+
     public void setErrorRecovery(boolean errorRecovery) {
         this.errorRecovery = errorRecovery;
     }