Merge branch 'master' into json_table_support

# Conflicts:
#	src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java
#	src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

Author: ANeumann82

.github/workflows/ci.yml

@@ -2,63 +2,104 @@ name: CI Pipeline
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "**" ]        # Run on every commit to any branch
   pull_request:
-    branches: [ "master" ]
+    branches: [ "**" ]        # Run for PRs from any branch
   workflow_dispatch:
 
 permissions: write-all
 
 jobs:
   gradle_check:
-    runs-on: ubuntu-latest
+    name: Gradle Check
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, windows-latest, macos-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'
-      - name: Build with Gradle
+
+      - name: Set up Gradle
         uses: gradle/actions/setup-gradle@main
+
       - name: Run Gradle Check
         run: ./gradlew check
 
+  maven_verify:
+    name: Maven Verify
+    needs: gradle_check              # ✅ Run only after Gradle check succeeds
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+#       currently Windows does not work w/ code page related issues
+#       os: [ ubuntu-latest, windows-latest, macos-latest ]
+        os: [ ubuntu-latest, macos-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'
+
+      - name: Run Maven Verify
+        run: mvn --batch-mode verify
+
   gradle_publish:
-    needs: gradle_check
+    name: Gradle Publish
+    needs: [ gradle_check, maven_verify ]  # ✅ Run only after both succeed
+    if: github.ref == 'refs/heads/master' && github.repository == 'JSQLParser/JSqlParser'  # ✅ Only for master branch of main repo
     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'
+
       - name: Build with Gradle
         uses: gradle/actions/setup-gradle@main
+
       - name: Publish with Gradle
         run: ./gradlew publish
         env:
           ossrhUsername: ${{ secrets.OSSRHUSERNAME }}
           ossrhPassword: ${{ secrets.OSSRHPASSWORD }}
+
       - uses: actions/setup-python@main
+
       - name: Install XSLT Processor
-        run: sudo apt-get install xsltproc sphinx-common
+        run: sudo apt-get install -y xsltproc sphinx-common
+
       - name: Install Python dependencies
-        #run: pip install furo myst_parser sphinx-prompt sphinx_substitution_extensions sphinx_issues sphinx_inline_tabs pygments
         run: pip install furo myst_parser sphinx_substitution_extensions sphinx_issues sphinx_inline_tabs pygments
+
       - name: Build Sphinx documentation with Gradle
-        run: ./gradlew -DFLOATING_TOC=false gitChangelogTask renderRR xslt xmldoc sphinx
-      - name: Deploy Sphinx documentation
+        run: FLOATING_TOC=false ./gradlew -DFLOATING_TOC=false gitChangelogTask renderRR xslt xmldoc sphinx
+
+      - name: Configure GitHub Pages
         uses: actions/configure-pages@main
+
       - name: Upload artifact
         uses: actions/upload-pages-artifact@main
         with:
           path: 'build/sphinx'
+
       - name: Deploy to GitHub Pages
         id: deployment
         uses: actions/deploy-pages@main

README.md

@@ -89,7 +89,8 @@ JSQLParserBenchmark.parseSQLStatements        5.1  avgt   15  86.592 ± 5.781  m
 
 | RDBMS                                                                                                           | Statements                                                                                                                              |
 |-----------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|
-| Oracle<br>MS SQL Server and Sybase<br>Postgres<br>MySQL and MariaDB<br>DB2<br>H2 and HSQLDB and Derby<br>SQLite | `SELECT`<br>`INSERT`, `UPDATE`, `UPSERT`, `MERGE`<br>`DELETE`, `TRUNCATE TABLE`<br>`CREATE ...`, `ALTER ....`, `DROP ...`<br>`WITH ...` |
+| BigQuery<br>Snowflake<br>DuckDB<br>Redshift<br>Oracle<br>MS SQL Server and Sybase<br>Postgres<br>MySQL and MariaDB<br>DB2<br>H2 and HSQLDB and Derby<br>SQLite | `SELECT`<br>`INSERT`, `UPDATE`, `UPSERT`, `MERGE`<br>`DELETE`, `TRUNCATE TABLE`<br>`CREATE ...`, `ALTER ....`, `DROP ...`<br>`WITH ...` |
+| PostgreSQL Row Level Security                                                                                   | `CREATE POLICY`<br>`ALTER TABLE ... ENABLE/DISABLE/FORCE/NO FORCE ROW LEVEL SECURITY`                                                  |
 | Salesforce SOQL                                                                                                 | `INCLUDES`, `EXCLUDES`                                                                                                                  |
 | Piped SQL (also known as FROM SQL)                                                                              |                                                                                                                                         |
 

build.gradle

@@ -1,6 +1,8 @@
 import se.bjurr.gitchangelog.plugin.gradle.GitChangelogTask
 import com.nwalsh.gradle.saxon.SaxonXsltTask
 
+import java.time.Instant
+
 buildscript {
     dependencies {
         classpath group: 'net.sf.saxon', name: 'Saxon-HE', version: 'latest.release'
@@ -72,6 +74,60 @@ version = getVersion( !System.getenv("RELEASE") )
 group = 'com.github.jsqlparser'
 description = 'JSQLParser library'
 
+tasks.register('generateBuildInfo') {
+    outputs.dir layout.buildDirectory.file("resources/main")
+    doLast {
+        def outputDir =  new File( layout.buildDirectory.file("generated/sources/buildinfo/java/main").get().asFile, "net/sf/jsqlparser")
+        outputDir.mkdirs()
+
+        def gitVersionStr = providers.exec {
+            commandLine "git", "--no-pager", "-C", project.projectDir,  "describe", "--tags", "--always", "--dirty=-SNAPSHOT"
+        }.standardOutput.asText.get().trim()
+
+        def gitCommitStr = providers.exec {
+            commandLine "git", "--no-pager", "-C", project.projectDir,  "rev-parse", "--short", "HEAD"
+        }.standardOutput.asText.get().trim()
+
+        def buildTime = Instant.now().toString()
+
+        def content = """\
+            |package ai.starlake.jsqltranspiler;
+            |
+            |public final class BuildInfo {
+            |  public static final String NAME = "${project.name}";
+            |  public static final String VERSION = "${gitVersionStr}";
+            |  public static final String GIT_COMMIT = "${gitCommitStr ?: 'unknown'}";
+            |  public static final String BUILD_TIME = "${buildTime}";
+            |}
+            """.stripMargin()
+
+        new File(outputDir, "BuildInfo.java").text = content
+    }
+}
+
+// Make sure the file is included in the compiled sources
+sourceSets {
+    main {
+        java {
+            srcDir layout.buildDirectory.file("generated/sources/buildinfo/java/main").get().asFile
+        }
+    }
+}
+
+tasks.withType(JavaCompile).configureEach {
+    mustRunAfter("generateBuildInfo")
+}
+
+tasks.withType(Pmd).configureEach {
+    mustRunAfter("generateBuildInfo")
+}
+
+tasks.withType(Checkstyle).configureEach {
+    exclude '**/module-info.java', '**/package-info.java'
+
+    mustRunAfter("generateBuildInfo")
+}
+
 repositories {
     gradlePluginPortal()
     mavenCentral()
@@ -179,6 +235,8 @@ jar {
             "Automatic-Module-Name": "net.sf.jsqlparser"
         )
     }
+
+    dependsOn(generateBuildInfo)
 }
 
 tasks.register('xmldoc', Javadoc) {

pom.xml

@@ -285,7 +285,14 @@
                             <goal>jjtree-javacc</goal>
                         </goals>
                         <configuration>
+                            <grammarEncoding>UTF-8</grammarEncoding>
+                            <isStatic>false</isStatic>
+                            <debugParser>false</debugParser>
+                            <debugLookAhead>false</debugLookAhead>
                             <codeGenerator>java</codeGenerator>
+
+                            <!-- <unicodeInput>true</unicodeInput> -->
+                            <!-- <javaUnicodeEscape>true</javaUnicodeEscape> -->
                         </configuration>
                     </execution>
                 </executions>
@@ -680,6 +687,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <pmdVersion>6.55.0</pmdVersion>
         <checkStyleVersion>10.14.0</checkStyleVersion>
     </properties>

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

@@ -0,0 +1,50 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2019 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.expression;
+
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+import java.util.Objects;
+
+public class DateUnitExpression extends ASTNodeAccessImpl implements Expression {
+
+    private final DateUnit type;
+
+    public DateUnitExpression(DateUnit type) {
+        this.type = Objects.requireNonNull(type);
+    }
+
+    public DateUnitExpression(String DateUnitStr) {
+        this.type = Objects.requireNonNull(DateUnit.from(DateUnitStr));
+    }
+
+    public DateUnit getType() {
+        return type;
+    }
+
+
+    @Override
+    public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S context) {
+        return expressionVisitor.visit(this, context);
+    }
+
+    @Override
+    public String toString() {
+        return type.toString();
+    }
+
+    public enum DateUnit {
+        CENTURY, DECADE, YEAR, QUARTER, MONTH, WEEK, DAY, HOUR, MINUTE, SECOND, MILLISECOND, MICROSECOND, NANOSECOND;
+
+        public static DateUnit from(String UnitStr) {
+            return Enum.valueOf(DateUnit.class, UnitStr.toUpperCase());
+        }
+    }
+}

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

@@ -779,4 +779,6 @@ default void visit(Inverse inverse) {
     <S> T visit(CosineSimilarity cosineSimilarity, S context);
 
     <S> T visit(FromQuery fromQuery, S context);
+
+    <S> T visit(DateUnitExpression dateUnitExpression, S context);
 }

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

@@ -840,4 +840,9 @@ public <S> T visit(FromQuery fromQuery, S context) {
         return null;
     }
 
+    @Override
+    public <S> T visit(DateUnitExpression dateUnitExpression, S context) {
+        return null;
+    }
+
 }

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

@@ -1,3 +1,12 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2025 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
 package net.sf.jsqlparser.expression;
 
 /**

src/main/java/net/sf/jsqlparser/schema/Sequence.java

@@ -158,7 +158,7 @@ public Sequence addParameters(Collection<? extends Parameter> parameters) {
      * The available parameters to a sequence
      */
     public enum ParameterType {
-        INCREMENT_BY, START_WITH, RESTART_WITH, MAXVALUE, NOMAXVALUE, MINVALUE, NOMINVALUE, CYCLE, NOCYCLE, CACHE, NOCACHE, ORDER, NOORDER, KEEP, NOKEEP, SESSION, GLOBAL;
+        INCREMENT_BY, INCREMENT, START_WITH, START, RESTART_WITH, MAXVALUE, NOMAXVALUE, MINVALUE, NOMINVALUE, CYCLE, NOCYCLE, CACHE, NOCACHE, ORDER, NOORDER, KEEP, NOKEEP, SESSION, GLOBAL;
 
         public static ParameterType from(String type) {
             return Enum.valueOf(ParameterType.class, type.toUpperCase());
@@ -189,8 +189,12 @@ public String formatParameter() {
             switch (option) {
                 case INCREMENT_BY:
                     return prefix("INCREMENT BY");
+                case INCREMENT:
+                    return prefix("INCREMENT");
                 case START_WITH:
                     return prefix("START WITH");
+                case START:
+                    return prefix("START");
                 case RESTART_WITH:
                     if (value != null) {
                         return prefix("RESTART WITH");

src/main/java/net/sf/jsqlparser/statement/StatementVisitor.java

@@ -17,6 +17,7 @@
 import net.sf.jsqlparser.statement.analyze.Analyze;
 import net.sf.jsqlparser.statement.comment.Comment;
 import net.sf.jsqlparser.statement.create.index.CreateIndex;
+import net.sf.jsqlparser.statement.create.policy.CreatePolicy;
 import net.sf.jsqlparser.statement.create.schema.CreateSchema;
 import net.sf.jsqlparser.statement.create.sequence.CreateSequence;
 import net.sf.jsqlparser.statement.create.synonym.CreateSynonym;
@@ -351,4 +352,10 @@ default void visit(LockStatement lock) {
         this.visit(lock, null);
     }
 
+    <S> T visit(CreatePolicy createPolicy, S context);
+
+    default void visit(CreatePolicy createPolicy) {
+        this.visit(createPolicy, null);
+    }
+
 }