Merge origin/master

Author: wumpz

.github/workflows/ci.yml

@@ -26,30 +26,8 @@ jobs:
       - name: Run Gradle Check
         run: ./gradlew check
 
-  maven_verify:
-    needs: gradle_check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@main
-        with:
-          fetch-depth: 0
-      - name: Set up JDK 17
-        uses: actions/setup-java@main
-        with:
-          java-version: '17'
-          distribution: 'temurin'
-          cache: maven
-          server-id: sonatype-nexus-snapshots
-          server-username: MAVEN_USERNAME
-          server-password: MAVEN_PASSWORD
-      - name: Build with Maven
-        run: mvn -B verify --file pom.xml -DdisableXmlReport=true -Djacoco.skip=true -Dpmd.skip=true
-        env:
-          MAVEN_USERNAME: ${{ secrets.OSSRHUSERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRHPASSWORD }}
-
   gradle_publish:
-    needs: maven_verify
+    needs: gradle_check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main

README.md

@@ -1,4 +1,4 @@
-# [JSqlParser 5.2 Website](https://jsqlparser.github.io/JSqlParser) <img src="src/site/sphinx/_images/logo-no-background.svg" alt="drawing" width="200" align="right"/>
+# [JSqlParser 5.3 Website](https://jsqlparser.github.io/JSqlParser) <img src="src/site/sphinx/_images/logo-no-background.svg" alt="drawing" width="200" align="right"/>
 
 [![CI](https://github.com/JSQLParser/JSqlParser/actions/workflows/ci.yml/badge.svg)](https://github.com/JSQLParser/JSqlParser/actions/workflows/ci.yml)
 [![Coverage Status](https://coveralls.io/repos/JSQLParser/JSqlParser/badge.svg?branch=master)](https://coveralls.io/r/JSQLParser/JSqlParser?branch=master)
@@ -69,16 +69,18 @@ JSQLParser-4.9 was the last JDK8 compatible version. JSQLParser-5.0 and later de
 
 Building JSQLParser-5.1 and newer with Gradle will depend on a JDK17 toolchain due to the used plugins.
 
+JSQLParser-5.4 Snapshot and later use JavaCC-8 Snapshots for generating the parser.
+
 ## Performance
 
 Unfortunately the released JSQLParser-5.2 shows a performance deterioration caused by commit [30cf5d7](https://github.com/JSQLParser/JSqlParser/commit/30cf5d7b930ae0a076f49deb5cc841d39e62b3dc) related to `FunctionAllColumns()`.
-This has been resolved in JSQLParser 5.3-SNAPSHOT and JMH benchmarks have been added to avoid such regressions in the future. Further all `LOOKAHEADS` have been revised one by one, and we have gained back a very good performance of the Parser.
+This has been resolved in JSQLParser 5.3-SNAPSHOT and JMH benchmarks have been added to avoid such regressions in the future. Further all `LOOKAHEAD` have been revised one by one, and we have gained back a very good performance of the Parser.
 
 ```text
-Benchmark                               (version)  Mode  Cnt    Score   Error  Units
-JSQLParserBenchmark.parseSQLStatements     latest  avgt   30   78.287 ± 4.730  ms/op <-- `FunctionAllColumns()` disabled
-JSQLParserBenchmark.parseSQLStatements        5.2  avgt   30  400.876 ± 8.291  ms/op
-JSQLParserBenchmark.parseSQLStatements        5.1  avgt   30   85.731 ± 1.288  ms/op
+Benchmark                               (version)  Mode  Cnt   Score   Error  Units
+JSQLParserBenchmark.parseSQLStatements     latest  avgt   15  82.695 ± 2.841  ms/op
+JSQLParserBenchmark.parseSQLStatements        5.3  avgt   15  84.687 ± 3.321  ms/op
+JSQLParserBenchmark.parseSQLStatements        5.1  avgt   15  86.592 ± 5.781  ms/op
 ```
 
 ## [Supported Grammar and Syntax](https://jsqlparser.github.io/JSqlParser/syntax.html)

build.gradle

@@ -3,7 +3,7 @@ import com.nwalsh.gradle.saxon.SaxonXsltTask
 
 buildscript {
     dependencies {
-        classpath group: 'net.sf.saxon', name: 'Saxon-HE', version: '12.5'
+        classpath group: 'net.sf.saxon', name: 'Saxon-HE', version: 'latest.release'
     }
 }
 
@@ -74,12 +74,11 @@ description = 'JSQLParser library'
 
 repositories {
     gradlePluginPortal()
-    mavenLocal()
     mavenCentral()
 
-    // Sonatype OSSRH
+    // JavaCC 8 Snapshots
     maven {
-        url = uri('https://s01.oss.sonatype.org/content/repositories/snapshots/')
+        url = uri('https://central.sonatype.com/repository/maven-snapshots/')
     }
 
     maven { url "https://dev.saxonica.com/maven" }
@@ -104,21 +103,31 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.4'
 
     // https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
-    testImplementation 'org.mockito:mockito-junit-jupiter:+'
+    testImplementation 'org.mockito:mockito-junit-jupiter:5.18.0'
 
     // Performance Benchmark
     testImplementation 'org.openjdk.jmh:jmh-core:+'
     testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:+'
 
     // Java Doc in XML Format
-    xmlDoclet 'com.manticore-projects.tools:xml-doclet:+'
+    xmlDoclet 'com.manticore-projects.tools:xml-doclet:2.+'
 
     // enforce latest version of JavaCC
-    testImplementation 'net.java.dev.javacc:javacc:+'
-    javacc 'net.java.dev.javacc:javacc:+'
+    testImplementation('org.javacc:core:8.1.0-SNAPSHOT') { changing = true }
+    testImplementation('org.javacc.generator:java:8.1.0-SNAPSHOT') { changing = true }
 
     jmh 'org.openjdk.jmh:jmh-core:1.37'
     jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
+    javacc('org.javacc:core:8.1.0-SNAPSHOT') { changing = true }
+    javacc('org.javacc.generator:java:8.1.0-SNAPSHOT') { changing = true }
+}
+configurations.configureEach {
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+        if (details.requested.group in ['org.javacc:core', 'org.javacc.generator']) {
+            // Check for updates every build
+            resolutionStrategy.cacheChangingModulesFor 30, 'seconds'
+        }
+    }
 }
 
 compileJavacc {
@@ -310,6 +319,7 @@ pmd {
     pmdMain {
         excludes = [
                 "build/generated/*"
+                , "**/net/sf/jsqlparser/parser/SimpleCharStream.java"
         ]
     }
 }
@@ -319,6 +329,12 @@ checkstyle {
     configFile = rootProject.file('config/checkstyle/checkstyle.xml')
 }
 
+tasks.named('checkstyleMain') {
+    source = source.filter {
+        !it.absolutePath.contains('net/sf/jsqlparser/parser/SimpleCharStream.java')
+    }
+}
+
 spotless {
     // optional: limit format enforcement to just the files changed by this feature branch
     ratchetFrom 'origin/master'
@@ -448,15 +464,15 @@ tasks.register('updateKeywords', JavaExec) {
     dependsOn(compileJava)
 }
 
-task xslt(type: SaxonXsltTask) {
+tasks.register('xslt', SaxonXsltTask) {
     def outFile = version.endsWith("-SNAPSHOT")
-            ?   file("src/site/sphinx/syntax_snapshot.rst")
-            :   file("src/site/sphinx/syntax_stable.rst")
+            ? file("src/site/sphinx/syntax_snapshot.rst")
+            : file("src/site/sphinx/syntax_stable.rst")
 
     dependsOn(renderRR)
     stylesheet file('src/main/resources/rr/xhtml2rst.xsl')
 
-    parameters (
+    parameters(
             "withFloatingToc": System.getenv().getOrDefault("FLOATING_TOC", "true"),
             "isSnapshot": Boolean.toString(version.endsWith("-SNAPSHOT"))
     )
@@ -513,7 +529,7 @@ publish {
 
 publishing {
     publications {
-        create("mavenJava", MavenPublication) {
+        mavenJava(MavenPublication) {
             artifactId = 'jsqlparser'
 
             from components.java
@@ -568,8 +584,8 @@ publishing {
     repositories {
         maven {
             name = "ossrh"
-            def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-            def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
+            def releasesRepoUrl = "https://central.sonatype.com/repository/maven-releases"
+            def snapshotsRepoUrl = "https://central.sonatype.com/repository/maven-snapshots/"
             url(version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl)
 
             credentials {
@@ -637,8 +653,8 @@ check {
 
 jmh {
     includes = ['.*JSQLParserBenchmark.*']
-    warmupIterations = 3
+    warmupIterations = 2
     fork = 3
-    iterations = 10
+    iterations = 5
     timeOnIteration = '1s'
 }

pom.xml

@@ -24,12 +24,37 @@
         </license>
     </licenses>
 
+    <repositories>
+        <repository>
+            <id>javacc8-snapshots</id>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases><enabled>false</enabled></releases>
+            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
+        </repository>
+        <repository>
+            <id>ossrh-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <snapshots><enabled>true</enabled></snapshots>
+            <releases><enabled>false</enabled></releases>
+        </repository>
+    </repositories>
+
     <dependencies>
         <!-- needed for parsing the Keywords via JTree in ParserKeywordsUtils -->
         <dependency>
-            <groupId>net.java.dev.javacc</groupId>
-            <artifactId>javacc</artifactId>
-            <version>7.0.13</version>
+            <groupId>org.javacc</groupId>
+            <artifactId>core</artifactId>
+            <version>8.1.0-SNAPSHOT</version>
+            <type>pom</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.javacc.generator</groupId>
+            <artifactId>java</artifactId>
+            <version>8.1.0-SNAPSHOT</version>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -111,11 +136,13 @@
     <distributionManagement>
         <repository>
             <id>sonatype-nexus-staging</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+            <url>https://central.sonatype.com/repository/maven-releases</url>
         </repository>
         <snapshotRepository>
-            <id>sonatype-nexus-snapshots</id> 
-            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+            <id>sonatype-nexus-snapshots</id>
+            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
+            <releases><enabled>false</enabled></releases>
+            <snapshots><enabled>true</enabled></snapshots>
         </snapshotRepository>
     </distributionManagement>
 -->
@@ -158,6 +185,7 @@
                     <excludes>
                         <exclude>**/*Bean.java</exclude>
                         <exclude>**/generated/*.java</exclude>
+                        <exclude>**/net/sf/jsqlparser/parser/SimpleCharStream.java</exclude>
                     </excludes>
                     <excludeRoots>
                         <excludeRoot>target/generated-sources</excludeRoot>
@@ -242,17 +270,20 @@
                             <goal>jjtree-javacc</goal>
                         </goals>
                         <configuration>
-                            <grammarEncoding>UTF-8</grammarEncoding>
-                            <isStatic>false</isStatic>
-                            <jdkVersion>1.8</jdkVersion>
+                            <codeGenerator>java</codeGenerator>
                         </configuration>
                     </execution>
                 </executions>
                 <dependencies>
                     <dependency>
-                        <groupId>net.java.dev.javacc</groupId>
-                        <artifactId>javacc</artifactId>
-                        <version>[7.0.13,8)</version>
+                        <groupId>org.javacc.generator</groupId>
+                        <artifactId>java</artifactId>
+                        <version>8.1.0-SNAPSHOT</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.javacc</groupId>
+                        <artifactId>core</artifactId>
+                        <version>8.1.0-SNAPSHOT</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -571,7 +602,7 @@
                             <logViolationsToConsole>true</logViolationsToConsole>
                             <includeTestSourceDirectory>true</includeTestSourceDirectory>
                             <sourceDirectories>${project.build.sourceDirectory}</sourceDirectories>
-                            <excludes>**/module-info.java</excludes>
+                            <excludes>**/module-info.java,**/net/sf/jsqlparser/parser/SimpleCharStream.java</excludes>
                             <checkstyleRules>
                                 <module name="Checker">
                                     <module name="SuppressWarningsFilter" />

src/main/java/module-info.java

@@ -36,7 +36,9 @@
     exports net.sf.jsqlparser.statement.delete;
     exports net.sf.jsqlparser.statement.drop;
     exports net.sf.jsqlparser.statement.execute;
+    exports net.sf.jsqlparser.statement.export;
     exports net.sf.jsqlparser.statement.grant;
+    exports net.sf.jsqlparser.statement.imprt;
     exports net.sf.jsqlparser.statement.insert;
     exports net.sf.jsqlparser.statement.merge;
     exports net.sf.jsqlparser.statement.piped;

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

@@ -60,7 +60,6 @@ public AnalyticExpression(Function function) {
         this.distinct = function.isDistinct();
         this.unique = function.isUnique();
 
-
         ExpressionList<? extends Expression> list = function.getParameters();
         if (list != null) {
             if (list.size() > 3) {
@@ -117,16 +116,16 @@ public void setKeep(KeepExpression keep) {
     }
 
     public ExpressionList<?> getPartitionExpressionList() {
-        return windowDef.partitionBy.getPartitionExpressionList();
+        return windowDef.partitionBy;
     }
 
-    public void setPartitionExpressionList(ExpressionList<?> partitionExpressionList) {
+    public void setPartitionExpressionList(ExpressionList<Expression> partitionExpressionList) {
         setPartitionExpressionList(partitionExpressionList, false);
     }
 
-    public void setPartitionExpressionList(ExpressionList<?> partitionExpressionList,
+    public void setPartitionExpressionList(ExpressionList<Expression> partitionExpressionList,
             boolean brackets) {
-        windowDef.partitionBy.setPartitionExpressionList(partitionExpressionList, brackets);
+        windowDef.partitionBy.setExpressions(partitionExpressionList, brackets);
     }
 
     public boolean isPartitionByBrackets() {