Merge origin/master

Author: wumpz

README.md

@@ -56,6 +56,9 @@ Also I would like to know about needed examples or documentation stuff.
 
 ## Extensions in the latest SNAPSHOT version 4.3
 
+* moved to JUnit 5 as a test framework
+* added **IGNORE NULLS** to window functions
+
 Additionally, we have fixed many errors and improved the code quality and the test coverage.
 
 ## Extensions of JSqlParser releases

build.gradle

@@ -19,9 +19,13 @@ java.sourceCompatibility = JavaVersion.VERSION_1_8
 repositories {
 	gradlePluginPortal()
     mavenLocal()
+    mavenCentral()
     maven {
         url = uri('https://repo.maven.apache.org/maven2/')
     }
+    maven {
+      url "https://plugins.gradle.org/m2/"
+    }
 }
 
 dependencies {
@@ -36,6 +40,12 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 
+    // https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
+    testImplementation 'org.mockito:mockito-junit-jupiter:4.1.0'
+    
+    // enforce latest version of JavaCC
+    javacc 'net.java.dev.javacc:javacc:7.0.10'
+    
 }
 
 compileJavacc {
@@ -56,6 +66,18 @@ jacoco {
 }
 
 test {
+    useJUnitPlatform()
+
+    // set heap size for the test JVM(s)
+    minHeapSize = "128m"
+    maxHeapSize = "1G"
+
+    jvmArgs << [
+            '-Djunit.jupiter.execution.parallel.enabled=true',
+            '-Djunit.jupiter.execution.parallel.config.strategy=dynamic',
+            '-Djunit.jupiter.execution.parallel.mode.default=concurrent'
+    ]
+
     finalizedBy jacocoTestReport // report is always generated after tests run
     finalizedBy jacocoTestCoverageVerification
 }
@@ -93,7 +115,7 @@ jacocoTestCoverageVerification {
             limit {
                 counter = 'LINE'
                 value = 'MISSEDCOUNT'
-                maximum = 5458
+                maximum = 5500
                 }
             excludes = [
                     'net.sf.jsqlparser.util.validation.*',

gradle.properties

@@ -0,0 +1,12 @@
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx1G -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError
+
+org.gradle.caching=true
+
+# Modularise your project and enable parallel build
+org.gradle.parallel=true
+
+# Enable configure on demand.
+org.gradle.configureondemand=true
+

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

@@ -36,7 +36,8 @@ public class AnalyticExpression extends ASTNodeAccessImpl implements Expression
     private AnalyticType type = AnalyticType.OVER;
     private boolean distinct = false;
     private boolean unique = false;
-    private boolean ignoreNulls = false;
+    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;
@@ -178,6 +179,14 @@ public void setIgnoreNulls(boolean ignoreNulls) {
         this.ignoreNulls = ignoreNulls;
     }
 
+    public boolean isIgnoreNullsOutside() {
+        return ignoreNullsOutside;
+    }
+
+    public void setIgnoreNullsOutside(boolean ignoreNullsOutside) {
+        this.ignoreNullsOutside = ignoreNullsOutside;
+    }
+
     @Override
     @SuppressWarnings({"PMD.CyclomaticComplexity", "PMD.NPathComplexity", "PMD.MissingBreakInSwitch"})
     public String toString() {
@@ -220,6 +229,10 @@ public String toString() {
             }
         }
 
+        if (isIgnoreNullsOutside()) {
+            b.append("IGNORE NULLS ");
+        }
+        
         switch (type) {
             case FILTER_ONLY:
                 return b.toString();

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

@@ -674,6 +674,10 @@ public void visit(AnalyticExpression aexpr) {
                 buffer.append(" ");
             }
         }
+        
+        if (aexpr.isIgnoreNullsOutside()) {
+            buffer.append("IGNORE NULLS ");
+        }
 
         switch (aexpr.getType()) {
             case FILTER_ONLY:

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

@@ -4184,7 +4184,7 @@ void windowFun(AnalyticExpression retval):{
          WindowElement windowElement = null;
          boolean partitionByBrackets = false;
 } {
-    (<K_OVER> {retval.setType(AnalyticType.OVER);}
+    ([<K_IGNORE> <K_NULLS> { retval.setIgnoreNullsOutside(true); } ] <K_OVER> {retval.setType(AnalyticType.OVER);}
         | <K_WITHIN> <K_GROUP> {retval.setType(AnalyticType.WITHIN_GROUP);} )
 
     "("

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

@@ -45,7 +45,10 @@
 import static org.junit.jupiter.api.Assertions.fail;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
 
+@Execution(ExecutionMode.CONCURRENT)
 public class SelectTest {
 
     private final CCJSqlParserManager parserManager = new CCJSqlParserManager();
@@ -4972,4 +4975,9 @@ public void testLogicalExpressionSelectItemIssue1381() throws JSQLParserExceptio
     public void testKeywordAtIssue1414() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT * FROM table1 at");
     }
+    
+    @Test
+    public void testIgnoreNullsForWindowFunctionsIssue1429() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT lag(mydata) IGNORE NULLS OVER (ORDER BY sortorder) AS previous_status FROM mytable");
+    }
 }