Merge branch 'refs/heads/master' into json_table_support

Author: ANeumann82

.github/workflows/ci.yml

@@ -39,9 +39,8 @@ jobs:
     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 ]
+       os: [ ubuntu-latest, macos-latest ]
     steps:
       - uses: actions/checkout@main
         with:
@@ -87,7 +86,7 @@ jobs:
         run: sudo apt-get install -y xsltproc sphinx-common
 
       - name: Install Python dependencies
-        run: pip install manticore_sphinx_theme myst_parser sphinx_substitution_extensions sphinx_issues sphinx_inline_tabs pygments
+        run: pip install manticore_sphinx_theme sphinx_javadoc_xml 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

.gitignore

@@ -8,10 +8,10 @@
 
 # Exclude the Auto-generated Changelog
 /src/site/sphinx/changelog.rst
-/src/site/sphinx/javadoc_stable.rst
 /src/site/sphinx/syntax_stable.rst
-/src/site/sphinx/javadoc_snapshot.rst
 /src/site/sphinx/syntax_snapshot.rst
+/src/site/sphinx/javadoc_stable.xml
+/src/site/sphinx/javadoc_snapshot.xml
 
 # Generated by javacc-maven-plugin
 /bin

README.md

@@ -76,11 +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.
+As per March-2026, the productions `Condition()`, `RegularCondition()` and `AndExpression()` have been refactored successfully. Furthermore, we have overhauled Token definition and handling of Reserved Keywords.  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  15.908 ± 0.446  ms/op <-- March/26
+JSQLParserBenchmark.parseSQLStatements     latest  avgt   15   7.602 ± 0.135  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
 ```

build.gradle

@@ -249,12 +249,6 @@ tasks.register('xmldoc', Javadoc) {
                     : "xmlDoclet/javadoc_stable.xml"
     )
 
-    def rstFile =  reporting.file(
-            version.endsWith("-SNAPSHOT")
-                    ? "xmlDoclet/javadoc_snapshot.rst"
-                    : "xmlDoclet/javadoc_stable.rst"
-    )
-
     source = sourceSets.main.allJava
     // add any generated Java sources
     source += fileTree(layout.buildDirectory.dir("generated/javacc").get().asFile) {
@@ -271,16 +265,12 @@ tasks.register('xmldoc', Javadoc) {
     options.doclet = "com.manticore.tools.xmldoclet.XmlDoclet"
     title = "API $version"
 
-    options.addBooleanOption("rst", true)
-    if (Boolean.parseBoolean(System.getProperty("FLOATING_TOC", "true"))) {
-        options.addBooleanOption("withFloatingToc", true)
-    }
     options.addStringOption("basePackage", "net.sf.jsqlparser")
     options.addStringOption("filename", outFile.getName())
 
     doLast {
         copy {
-            from rstFile
+            from outFile
             into layout.projectDirectory.dir("src/site/sphinx/").asFile
         }
     }

pom.xml

@@ -99,7 +99,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.27.3</version>
+            <version>(3.27.7,)</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -277,7 +277,7 @@
             <plugin>
                 <groupId>org.javacc.plugin</groupId>
                 <artifactId>javacc-maven-plugin</artifactId>
-                <version>3.0.3</version>
+                <version>3.8.0</version>
                 <executions>
                     <execution>
                         <id>javacc</id>
@@ -286,14 +286,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> -->
+                            <javaccCmdLineArgs>
+                                <gen>-CODE_GENERATOR="Java"</gen>
+                                <enc>-GRAMMAR_ENCODING="UTF-8"</enc>
+                            </javaccCmdLineArgs>
+                            <jjtreeCmdLineArgs>
+                                <enc>-GRAMMAR_ENCODING="UTF-8"</enc>
+                                <gen>-CODE_GENERATOR="Java"</gen>
+                            </jjtreeCmdLineArgs>
                         </configuration>
                     </execution>
                 </executions>

src/main/java/net/sf/jsqlparser/statement/select/MySqlSelectIntoClause.java

@@ -0,0 +1,205 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2026 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.statement.select;
+
+import java.io.Serializable;
+import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+public class MySqlSelectIntoClause extends ASTNodeAccessImpl implements Serializable {
+
+    public enum Position {
+        BEFORE_FROM, TRAILING
+    }
+
+    public enum Type {
+        OUTFILE, DUMPFILE
+    }
+
+    public enum FieldsKeyword {
+        FIELDS, COLUMNS
+    }
+
+    private Position position = Position.TRAILING;
+    private Type type;
+    private StringValue fileName;
+    private String characterSet;
+    private FieldsKeyword fieldsKeyword;
+    private StringValue fieldsTerminatedBy;
+    private boolean fieldsOptionallyEnclosed;
+    private StringValue fieldsEnclosedBy;
+    private StringValue fieldsEscapedBy;
+    private StringValue linesStartingBy;
+    private StringValue linesTerminatedBy;
+
+    public Position getPosition() {
+        return position;
+    }
+
+    public void setPosition(Position position) {
+        this.position = position;
+    }
+
+    public MySqlSelectIntoClause withPosition(Position position) {
+        this.setPosition(position);
+        return this;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public void setType(Type type) {
+        this.type = type;
+    }
+
+    public StringValue getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(StringValue fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getCharacterSet() {
+        return characterSet;
+    }
+
+    public void setCharacterSet(String characterSet) {
+        this.characterSet = characterSet;
+    }
+
+    public FieldsKeyword getFieldsKeyword() {
+        return fieldsKeyword;
+    }
+
+    public void setFieldsKeyword(FieldsKeyword fieldsKeyword) {
+        this.fieldsKeyword = fieldsKeyword;
+    }
+
+    public StringValue getFieldsTerminatedBy() {
+        return fieldsTerminatedBy;
+    }
+
+    public void setFieldsTerminatedBy(StringValue fieldsTerminatedBy) {
+        this.fieldsTerminatedBy = fieldsTerminatedBy;
+    }
+
+    public boolean isFieldsOptionallyEnclosed() {
+        return fieldsOptionallyEnclosed;
+    }
+
+    public void setFieldsOptionallyEnclosed(boolean fieldsOptionallyEnclosed) {
+        this.fieldsOptionallyEnclosed = fieldsOptionallyEnclosed;
+    }
+
+    public StringValue getFieldsEnclosedBy() {
+        return fieldsEnclosedBy;
+    }
+
+    public void setFieldsEnclosedBy(StringValue fieldsEnclosedBy) {
+        this.fieldsEnclosedBy = fieldsEnclosedBy;
+    }
+
+    public StringValue getFieldsEscapedBy() {
+        return fieldsEscapedBy;
+    }
+
+    public void setFieldsEscapedBy(StringValue fieldsEscapedBy) {
+        this.fieldsEscapedBy = fieldsEscapedBy;
+    }
+
+    public StringValue getLinesStartingBy() {
+        return linesStartingBy;
+    }
+
+    public void setLinesStartingBy(StringValue linesStartingBy) {
+        this.linesStartingBy = linesStartingBy;
+    }
+
+    public StringValue getLinesTerminatedBy() {
+        return linesTerminatedBy;
+    }
+
+    public void setLinesTerminatedBy(StringValue linesTerminatedBy) {
+        this.linesTerminatedBy = linesTerminatedBy;
+    }
+
+    public boolean hasFieldsClause() {
+        return fieldsKeyword != null || fieldsTerminatedBy != null || fieldsEnclosedBy != null
+                || fieldsEscapedBy != null;
+    }
+
+    public boolean hasLinesClause() {
+        return linesStartingBy != null || linesTerminatedBy != null;
+    }
+
+    public StringBuilder appendTo(StringBuilder builder) {
+        builder.append("INTO ").append(type);
+        appendFileName(builder);
+        appendCharacterSet(builder);
+        appendFieldsClause(builder);
+        appendLinesClause(builder);
+        return builder;
+    }
+
+    private void appendFileName(StringBuilder builder) {
+        if (fileName != null) {
+            builder.append(" ").append(fileName);
+        }
+    }
+
+    private void appendCharacterSet(StringBuilder builder) {
+        if (characterSet != null) {
+            builder.append(" CHARACTER SET ").append(characterSet);
+        }
+    }
+
+    private void appendFieldsClause(StringBuilder builder) {
+        if (!hasFieldsClause()) {
+            return;
+        }
+
+        builder.append(" ").append(fieldsKeyword != null ? fieldsKeyword : FieldsKeyword.FIELDS);
+
+        if (fieldsTerminatedBy != null) {
+            builder.append(" TERMINATED BY ").append(fieldsTerminatedBy);
+        }
+        if (fieldsEnclosedBy != null) {
+            builder.append(" ");
+            if (fieldsOptionallyEnclosed) {
+                builder.append("OPTIONALLY ");
+            }
+            builder.append("ENCLOSED BY ").append(fieldsEnclosedBy);
+        }
+        if (fieldsEscapedBy != null) {
+            builder.append(" ESCAPED BY ").append(fieldsEscapedBy);
+        }
+    }
+
+    private void appendLinesClause(StringBuilder builder) {
+        if (!hasLinesClause()) {
+            return;
+        }
+
+        builder.append(" LINES");
+        if (linesStartingBy != null) {
+            builder.append(" STARTING BY ").append(linesStartingBy);
+        }
+        if (linesTerminatedBy != null) {
+            builder.append(" TERMINATED BY ").append(linesTerminatedBy);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return appendTo(new StringBuilder()).toString();
+    }
+}

src/main/java/net/sf/jsqlparser/statement/select/PlainSelect.java

@@ -34,6 +34,7 @@ public class PlainSelect extends Select {
     private BigQuerySelectQualifier bigQuerySelectQualifier = null;
     private List<SelectItem<?>> selectItems;
     private List<Table> intoTables;
+    private MySqlSelectIntoClause mySqlSelectIntoClause;
     private FromItem fromItem;
     private List<LateralView> lateralViews;
     private List<Join> joins;
@@ -142,6 +143,14 @@ public void setIntoTables(List<Table> intoTables) {
         this.intoTables = intoTables;
     }
 
+    public MySqlSelectIntoClause getMySqlSelectIntoClause() {
+        return mySqlSelectIntoClause;
+    }
+
+    public void setMySqlSelectIntoClause(MySqlSelectIntoClause mySqlSelectIntoClause) {
+        this.mySqlSelectIntoClause = mySqlSelectIntoClause;
+    }
+
     public List<SelectItem<?>> getSelectItems() {
         return selectItems;
     }
@@ -564,6 +573,12 @@ public StringBuilder appendSelectBodyTo(StringBuilder builder) {
             }
         }
 
+        if (mySqlSelectIntoClause != null
+                && mySqlSelectIntoClause
+                        .getPosition() == MySqlSelectIntoClause.Position.BEFORE_FROM) {
+            builder.append(" ").append(mySqlSelectIntoClause);
+        }
+
         if (fromItem != null) {
             builder.append(" FROM ");
             if (isUsingOnly) {
@@ -646,6 +661,11 @@ public String toString() {
         StringBuilder builder = new StringBuilder();
         super.appendTo(builder);
 
+        if (mySqlSelectIntoClause != null
+                && mySqlSelectIntoClause.getPosition() == MySqlSelectIntoClause.Position.TRAILING) {
+            builder.append(" ").append(mySqlSelectIntoClause);
+        }
+
         if (settings != null && !settings.isEmpty()) {
             builder.append(" SETTINGS ");
             UpdateSet.appendUpdateSetsTo(builder, settings);
@@ -698,6 +718,11 @@ public PlainSelect withIntoTables(List<Table> intoTables) {
         return this;
     }
 
+    public PlainSelect withMySqlSelectIntoClause(MySqlSelectIntoClause mySqlSelectIntoClause) {
+        this.setMySqlSelectIntoClause(mySqlSelectIntoClause);
+        return this;
+    }
+
     public PlainSelect withWhere(Expression where) {
         this.setWhere(where);
         return this;