Merge branch 'master' into json_table_support

# Conflicts:
#	src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

Author: ANeumann82

.github/dependabot.yml

@@ -87,7 +87,7 @@ jobs:
         run: sudo apt-get install -y xsltproc sphinx-common
 
       - name: Install Python dependencies
-        run: pip install furo myst_parser sphinx_substitution_extensions sphinx_issues sphinx_inline_tabs pygments
+        run: pip install manticore_sphinx_theme myst_parser sphinx_substitution_extensions sphinx_issues sphinx_inline_tabs pygments
 
       - name: Build Sphinx documentation with Gradle
         run: FLOATING_TOC=false ./gradlew -DFLOATING_TOC=false gitChangelogTask renderRR xslt xmldoc sphinx

.github/workflows/ci.yml

@@ -3,7 +3,7 @@
 [![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)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/6f9a2d7eb98f45969749e101322634a1)](https://www.codacy.com/gh/JSQLParser/JSqlParser/dashboard?utm_source=github.com&utm_medium=referral&utm_content=JSQLParser/JSqlParser&utm_campaign=Badge_Grade)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.jsqlparser/jsqlparser/badge.svg)](http://maven-badges.herokuapp.com/maven-central/com.github.jsqlparser/jsqlparser) [![Javadocs](https://www.javadoc.io/badge/com.github.jsqlparser/jsqlparser.svg)](https://www.javadoc.io/doc/com.github.jsqlparser/jsqlparser)
+[![Maven Central](https://img.shields.io/maven-central/v/com.github.jsqlparser/jsqlparser.svg?label=maven-central)](https://central.sonatype.com/artifact/com.github.jsqlparser/jsqlparser) [![Javadocs](https://www.javadoc.io/badge/com.github.jsqlparser/jsqlparser.svg)](https://www.javadoc.io/doc/com.github.jsqlparser/jsqlparser)
 [![Gitter](https://badges.gitter.im/JSQLParser/JSqlParser.svg)](https://gitter.im/JSQLParser/JSqlParser?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 A huge thank you to our sponsor, [Starlake.ai](https://starlake.ai/) who simplifies data ingestion, transformation, and orchestration, enabling faster delivery of high-quality data. Starlake has been instrumental in providing Piped SQL and numerous test cases for BigQuery, Redshift, DataBricks, and DuckDB. Show your support for ongoing development by visiting Starlake.ai and giving us a star!
@@ -76,9 +76,11 @@ JSQLParser-5.4 Snapshot and later use JavaCC-8 Snapshots for generating the pars
 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 `LOOKAHEAD` have been revised one by one, and we have gained back a very good performance of the Parser.
 
+As per March-2026, the productions `Condition()`, `RegularCondition()` and `AndExpression()` have been refactored successfully. This resulted in a massive performance boost and seem to have solved most of the performance issues.
+
 ```text
 Benchmark                               (version)  Mode  Cnt   Score   Error  Units
-JSQLParserBenchmark.parseSQLStatements     latest  avgt   15  82.695 ± 2.841  ms/op
+JSQLParserBenchmark.parseSQLStatements     latest  avgt   15  15.908 ± 0.446  ms/op <-- March/26
 JSQLParserBenchmark.parseSQLStatements        5.3  avgt   15  84.687 ± 3.321  ms/op
 JSQLParserBenchmark.parseSQLStatements        5.1  avgt   15  86.592 ± 5.781  ms/op
 ```
@@ -105,7 +107,6 @@ If you like JSqlParser then please check out its related projects:
 * [JSQLTranspiler](https://manticore-projects.com/JSQLTranspiler/index.html) for dialect specific rewriting, SQL Column resolution and Lineage, provided by [Starlake.ai](https://starlake.ai/)
 
 ## Alternatives to JSqlParser?
-[**General SQL Parser**](http://www.sqlparser.com/features/introduce.php?utm_source=github-jsqlparser&utm_medium=text-general) looks pretty good, with extended SQL syntax (like PL/SQL and T-SQL) and java + .NET APIs. The tool is commercial (license available online), with a free download option.
 
 Alternatively the dual-licensed [JOOQ](https://www.jooq.org/doc/latest/manual/sql-building/sql-parser/) provides a handwritten Parser supporting a lot of RDBMS, translation between dialects, SQL transformation, can be used as a JDBC proxy for translation and transformation purposes.
 

README.md

@@ -91,7 +91,7 @@ tasks.register('generateBuildInfo') {
         def buildTime = Instant.now().toString()
 
         def content = """\
-            |package ai.starlake.jsqltranspiler;
+            |package net.sf.jsqlparser;
             |
             |public final class BuildInfo {
             |  public static final String NAME = "${project.name}";
@@ -154,6 +154,7 @@ dependencies {
     testImplementation 'com.h2database:h2:+'
 
     // for JaCoCo Reports
+    testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.4'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.4'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.4'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.4'
@@ -221,18 +222,18 @@ javadoc {
 jar {
     manifest {
         attributes (
-            "Automatic-Module-Name": "net.sf.jsqlparser"
+                "Automatic-Module-Name": "net.sf.jsqlparser"
         )
     }
 
     bundle {
         properties.empty()
         bnd(
-            "Created-By": System.properties.get('user.name'),
-            "Bundle-SymbolicName": "net.sf.jsqlparser",
-            "Import-Package": "*",
-            "Export-Package": "net.sf.jsqlparser.*",
-            "Automatic-Module-Name": "net.sf.jsqlparser"
+                "Created-By": System.properties.get('user.name'),
+                "Bundle-SymbolicName": "net.sf.jsqlparser",
+                "Import-Package": "*",
+                "Export-Package": "net.sf.jsqlparser.*",
+                "Automatic-Module-Name": "net.sf.jsqlparser"
         )
     }
 
@@ -343,7 +344,7 @@ jacocoTestCoverageVerification {
 
                 //@todo: temporarily increased to 7000, we need to bring that down to 5500 after accepting the Keywords PR
                 maximum = 20000
-                }
+            }
             excludes = [
                     'net.sf.jsqlparser.util.validation.*',
                     'net.sf.jsqlparser.**.*Adapter',
@@ -378,27 +379,31 @@ spotbugsMain {
 spotbugs {
     // fail only on P1 and without the net.sf.jsqlparser.parser.*
     excludeFilter = file("config/spotbugs/spotBugsExcludeFilter.xml")
+}
 
-    // do not run over the test, although we should do that eventually
-    spotbugsTest.enabled = false
+// do not run over the test, although we should do that eventually
+tasks.named('spotbugsTest').configure {
+    enabled = false
 }
 
 pmd {
+    // later versions throw NPE
+    toolVersion = '7.17.0'
+
     consoleOutput = true
     sourceSets = [sourceSets.main]
 
     // clear the ruleset in order to use configured rules only
     ruleSets = []
-
-    //rulesMinimumPriority = 1
+    rulesMinimumPriority = 2
     ruleSetFiles = files("config/pmd/ruleset.xml")
+}
 
-    pmdMain {
-        excludes = [
-                "build/generated/*"
-                , "**/net/sf/jsqlparser/parser/SimpleCharStream.java"
-        ]
-    }
+tasks.named('pmdMain').configure {
+    excludes = [
+            "build/generated/*"
+            , "**/net/sf/jsqlparser/parser/SimpleCharStream.java"
+    ]
 }
 
 checkstyle {
@@ -461,28 +466,34 @@ tasks.register('renderRR') {
         }
 
         // Convert JJ file to EBNF
-        tasks.register("convertJJ", JavaExec) {
-            standardOutput = new FileOutputStream(new File(rrDir, "JSqlParserCC.ebnf"))
-            mainClass = "-jar"
-            args = [
-                    new File(rrDir, "convert.war").absolutePath,
-                    layout.buildDirectory.dir("generated/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jj").get().asFile.absolutePath
-            ]
-        }.get().exec()
+        def ebnfFile = new File(rrDir, "JSqlParserCC.ebnf")
+        def jjFile = layout.buildDirectory.dir("generated/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jj").get().asFile.absolutePath
+
+        def convertProc = new ProcessBuilder('java', '-jar',
+                new File(rrDir, "convert.war").absolutePath,
+                jjFile)
+                .redirectOutput(ebnfFile)
+                .redirectErrorStream(true)
+                .start()
+        if (convertProc.waitFor() != 0) {
+            throw new GradleException("Failed to convert JJ to EBNF")
+        }
 
         // Generate RR diagrams
-        tasks.register("generateRR", JavaExec) {
-            mainClass = "-jar"
-            args = [
-                    new File(rrDir, "rr.war").absolutePath,
-                    "-noepsilon",
-                    "-color:#4D88FF",
-                    "-offset:0",
-                    "-width:800",
-                    "-out:${new File(rrDir, "JSqlParserCC.xhtml")}",
-                    new File(rrDir, "JSqlParserCC.ebnf").absolutePath
-            ]
-        }.get().exec()
+        def rrProc = new ProcessBuilder('java', '-jar',
+                new File(rrDir, "rr.war").absolutePath,
+                "-noepsilon",
+                "-color:#4D88FF",
+                "-offset:0",
+                "-width:800",
+                "-out:${new File(rrDir, "JSqlParserCC.xhtml")}",
+                new File(rrDir, "JSqlParserCC.ebnf").absolutePath)
+                .redirectErrorStream(true)
+                .start()
+        rrProc.inputStream.eachLine { logger.info(it) }
+        if (rrProc.waitFor() != 0) {
+            throw new GradleException("Failed to generate RR diagrams")
+        }
     }
 }
 
@@ -528,13 +539,13 @@ Version {{name}}
 
 tasks.register('updateKeywords', JavaExec) {
     group = "Execution"
-    description = "Run the main class with JavaExecTask"
+    description = "Generate the Reserved Keywords documentation"
     classpath = sourceSets.main.runtimeClasspath
     args = [
             file('src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt').absolutePath
             , file('src/site/sphinx/keywords.rst').absolutePath
     ]
-    main("net.sf.jsqlparser.parser.ParserKeywordsUtils")
+    mainClass.set("net.sf.jsqlparser.parser.ParserKeywordsUtils")
 
     dependsOn(compileJava)
 }
@@ -548,7 +559,7 @@ tasks.register('xslt', SaxonXsltTask) {
     stylesheet file('src/main/resources/rr/xhtml2rst.xsl')
 
     parameters(
-            "withFloatingToc": System.getProperty("FLOATING_TOC", "true"),
+            "withFloatingToc": System.getProperty("FLOATING_TOC", "false"),
             "isSnapshot": Boolean.toString(version.endsWith("-SNAPSHOT"))
     )
 
@@ -732,4 +743,4 @@ jmh {
     fork = 3
     iterations = 5
     timeOnIteration = '1s'
-}
+}

build.gradle

@@ -20,14 +20,15 @@ under the License.
 <ruleset name="Default Maven PMD Plugin Ruleset" xmlns="http://pmd.sourceforge.net/ruleset/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 http://pmd.sourceforge.net/ruleset_2_0_0.xsd">
 
 	<description>
-        The default ruleset used by the Maven PMD Plugin, when no other ruleset is specified.
-        It contains the rules of the old (pre PMD 6.0.0) rulesets java-basic, java-empty, java-imports,
-        java-unnecessary, java-unusedcode.
+		Custom PMD ruleset, compatible with PMD 7.x.
 
-        This ruleset might be used as a starting point for an own customized ruleset [0].
+		Based on the old (pre PMD 6.0.0) rulesets java-basic, java-empty, java-imports,
+		java-unnecessary, java-unusedcode, migrated for PMD 7.
 
-        [0] https://pmd.github.io/latest/pmd_userdocs_making_rulesets.html
-    </description>
+		This ruleset might be used as a starting point for an own customized ruleset [0].
+
+		[0] https://pmd.github.io/latest/pmd_userdocs_making_rulesets.html
+	</description>
 
 	<rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP" />
 	<rule ref="category/java/bestpractices.xml/CheckResultSet" />
@@ -46,6 +47,14 @@ under the License.
 	<rule ref="category/java/codestyle.xml/UselessParentheses" />
 	<rule ref="category/java/codestyle.xml/UselessQualifiedThis" />
 
+	<!-- PMD 7: replaces EmptyFinallyBlock, EmptyIfStmt, EmptyInitializer,
+	     EmptyStatementBlock, EmptySwitchStatements, EmptySynchronizedBlock,
+	     EmptyTryBlock, EmptyWhileStmt (all removed in PMD 7) -->
+	<rule ref="category/java/codestyle.xml/EmptyControlStatement" />
+
+	<!-- PMD 7: replaces EmptyStatementNotInLoop (removed in PMD 7) -->
+	<rule ref="category/java/codestyle.xml/UnnecessarySemicolon" />
+
 	<rule ref="category/java/codestyle.xml/MethodNamingConventions">
 		<properties>
 			<property name="methodPattern" value="[a-z][a-zA-Z0-9]*" />
@@ -63,14 +72,15 @@ under the License.
 	<rule ref="category/java/design.xml/UselessOverridingMethod" />
 	<rule ref="category/java/design.xml/AvoidThrowingNullPointerException" />
 
-
 	<rule ref="category/java/design.xml/CyclomaticComplexity">
 		<properties>
 			<property name="classReportLevel" value="200" />
 			<property name="methodReportLevel" value="120" />
 		</properties>
 	</rule>
-	<rule ref="category/java/design.xml/ExcessiveMethodLength" />
+
+	<!-- PMD 7: ExcessiveMethodLength was removed, use NcssCount instead -->
+	<rule ref="category/java/design.xml/NcssCount" />
 
 	<rule ref="category/java/errorprone.xml/AvoidBranchingStatementAsLastInLoop" />
 	<rule ref="category/java/errorprone.xml/AvoidDecimalLiteralsInBigDecimalConstructor" />
@@ -80,32 +90,25 @@ under the License.
 	<rule ref="category/java/errorprone.xml/CheckSkipResult" />
 	<rule ref="category/java/errorprone.xml/ClassCastExceptionWithToArray" />
 	<rule ref="category/java/errorprone.xml/DontUseFloatTypeForLoopIndices" />
+
+	<!-- EmptyCatchBlock is explicitly kept as a separate rule in PMD 7 -->
 	<rule ref="category/java/errorprone.xml/EmptyCatchBlock" />
-	<rule ref="category/java/errorprone.xml/EmptyFinallyBlock" />
-	<rule ref="category/java/errorprone.xml/EmptyIfStmt" />
-	<rule ref="category/java/errorprone.xml/EmptyInitializer" />
-	<rule ref="category/java/errorprone.xml/EmptyStatementBlock" />
-	<rule ref="category/java/errorprone.xml/EmptyStatementNotInLoop" />
-	<rule ref="category/java/errorprone.xml/EmptySwitchStatements" />
-	<rule ref="category/java/errorprone.xml/EmptySynchronizedBlock" />
-	<rule ref="category/java/errorprone.xml/EmptyTryBlock" />
-	<rule ref="category/java/errorprone.xml/EmptyWhileStmt" />
+
 	<rule ref="category/java/errorprone.xml/JumbledIncrementer" />
 	<rule ref="category/java/errorprone.xml/MisplacedNullCheck" />
 	<rule ref="category/java/errorprone.xml/OverrideBothEqualsAndHashcode" />
 	<rule ref="category/java/errorprone.xml/ReturnFromFinallyBlock" />
 	<rule ref="category/java/errorprone.xml/UnconditionalIfStatement" />
 	<rule ref="category/java/errorprone.xml/UnnecessaryConversionTemporary" />
 	<rule ref="category/java/errorprone.xml/UnusedNullCheckInEquals" />
-	<rule ref="category/java/errorprone.xml/UselessOperationOnImmutable" />
-    
-    <!-- for Codazy -->
+
+	<!-- for Codazy -->
 	<rule ref="category/java/multithreading.xml/AvoidThreadGroup" />
 	<rule ref="category/java/multithreading.xml/DontCallThreadRun" />
 	<rule ref="category/java/multithreading.xml/DoubleCheckedLocking" />
 
 	<rule ref="category/java/performance.xml/BigIntegerInstantiation" />
 
-    <!-- for Codazy -->
+	<!-- for Codazy -->
 	<!-- <rule ref="category/java/documentation.xml/UncommentedEmptyMethodBody" /> -->
-</ruleset>
+</ruleset>

config/pmd/ruleset.xml

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME