Merge remote-tracking branch 'origin/master' into fix/optional-blank-line-statement-separator

# Conflicts:
#	src/main/java/net/sf/jsqlparser/parser/AbstractJSqlParser.java
#	src/main/java/net/sf/jsqlparser/parser/feature/Feature.java

Author: edeadington

src/main/java/net/sf/jsqlparser/parser/AbstractJSqlParser.java

@@ -39,7 +39,8 @@ public enum Dialect {
                         Feature.allowDoubleQuotedStrings), SQLSERVER(AdjacentStringLiterals.OFF,
                                 Feature.allowSquareBracketQuotation), POSTGRESQL(
                                         AdjacentStringLiterals.NEWLINE,
-                                        Feature.allowDollarQuotedStringTags), H2, EXASOL, BIGQUERY(
+                                        Feature.allowDollarQuotedStringTags,
+                                        Feature.allowDigitSeparators), H2, EXASOL, BIGQUERY(
                                                 AdjacentStringLiterals.WHITESPACE,
                                                 Feature.allowDoubleQuotedStrings,
                                                 Feature.allowHashLineComments,
@@ -199,6 +200,14 @@ public P withBlankLinesAsSeparator(boolean allowBlankLinesAsStatementSeparator)
                 allowBlankLinesAsStatementSeparator);
     }
 
+    public P withDigitSeparators() {
+        return withFeature(Feature.allowDigitSeparators, true);
+    }
+
+    public P withDigitSeparators(boolean allowDigitSeparators) {
+        return withFeature(Feature.allowDigitSeparators, allowDigitSeparators);
+    }
+
     public P withUnparenthesizedSubSelects() {
         return withFeature(Feature.allowUnparenthesizedSubSelects, true);
     }

src/main/java/net/sf/jsqlparser/parser/feature/Feature.java

@@ -896,6 +896,12 @@ public enum Feature {
      */
     allowBlankLinesAsStatementSeparator(true),
 
+    /**
+     * allows digit separators in numeric literals, e.g. {@code 1_000_000} (DuckDB, PostgreSQL 16);
+     * disabled by default, where MySQL reads {@code 2024_01} as an identifier
+     */
+    allowDigitSeparators(false),
+
     /**
      * allows sub selects without parentheses, e.g. `select * from dual where 1 = select 1`
      */

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

@@ -34,23 +34,6 @@ public StringBuilder appendSelectBodyTo(StringBuilder builder) {
         return builder;
     }
 
-    @SuppressWarnings({"PMD.CyclomaticComplexity"})
-    @Override
-    public StringBuilder appendTo(StringBuilder builder) {
-
-        appendSelectBodyTo(builder);
-
-        builder.append(orderByToString(false, orderByElements));
-
-        if (limit != null) {
-            builder.append(limit);
-        }
-        if (offset != null) {
-            builder.append(offset);
-        }
-        return builder;
-    }
-
     @Override
     public <T, S> T accept(SelectVisitor<T> selectVisitor, S context) {
         return selectVisitor.visit(this, context);

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

@@ -13,6 +13,8 @@
 import net.sf.jsqlparser.statement.piped.FromQuery;
 import net.sf.jsqlparser.statement.select.*;
 
+import java.util.List;
+
 /**
  * @author jxnu-liguobin
  */
@@ -84,18 +86,39 @@ public <S> StringBuilder visit(LateralSubSelect lateralSubSelect, S context) {
 
     @Override
     public <S> StringBuilder visit(TableStatement tableStatement, S context) {
+        List<WithItem<?>> withItemsList = tableStatement.getWithItemsList();
+        if (withItemsList != null && !withItemsList.isEmpty()) {
+            SelectDeParser selectDeParser = new SelectDeParser(expressionVisitor, builder);
+            builder.append("WITH ");
+            for (int i = 0; i < withItemsList.size(); i++) {
+                if (i > 0) {
+                    builder.append(", ");
+                }
+                withItemsList.get(i).accept((SelectVisitor<?>) selectDeParser, context);
+            }
+            builder.append(" ");
+        }
         tableStatement.appendSelectBodyTo(builder);
         if (tableStatement.getOrderByElements() != null) {
             new OrderByDeParser(expressionVisitor, builder)
                     .deParse(tableStatement.getOrderByElements());
         }
 
+        if (tableStatement.getOption() != null) {
+            builder.append(tableStatement.getOption());
+        }
         if (tableStatement.getLimit() != null) {
             new LimitDeparser(expressionVisitor, builder).deParse(tableStatement.getLimit());
         }
         if (tableStatement.getOffset() != null) {
             deparse(tableStatement.getOffset());
         }
+        if (tableStatement.getFetch() != null) {
+            builder.append(tableStatement.getFetch());
+        }
+        if (tableStatement.getIsolation() != null) {
+            builder.append(tableStatement.getIsolation());
+        }
 
         // TODO UNION