JSQLParser · manticore-projects · Sep 12, 2026 · Sep 12, 2026 · Sep 12, 2026
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterExpressionPartition.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterExpressionPartition.java
@@ -14,6 +14,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Consumer;
+import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.create.table.PartitionBound;
 import net.sf.jsqlparser.statement.create.table.PartitionDefinition;
@@ -292,6 +294,15 @@ public AlterExpressionPartition addPartitionDefinitions(
 
     @Override
     protected void appendBody(StringBuilder b) {
+        appendBody(b, b::append);
+    }
+
+    public void appendTo(StringBuilder b, Consumer<Expression> expressionPrinter) {
+        appendBody(b, expressionPrinter);
+        appendCommonTail(b);
+    }
+
+    private void appendBody(StringBuilder b, Consumer<Expression> expressionPrinter) {
         switch (getOperation()) {
             case ADD_PARTITION:
                 b.append("ADD PARTITION ")
@@ -302,8 +313,12 @@ protected void appendBody(StringBuilder b) {
                         .append(PlainSelect.getStringList(getPartitionNames()));
                 break;
             case ATTACH_PARTITION:
-                b.append("ATTACH PARTITION ").append(partitionTable).append(" ")
-                        .append(partitionBound);
+                b.append("ATTACH PARTITION ").append(partitionTable).append(' ');
+                if (partitionBound == null) {
+                    b.append("null");
+                } else {
+                    partitionBound.appendTo(b, expressionPrinter);
+                }
                 break;
             case DETACH_PARTITION:
                 b.append("DETACH PARTITION ").append(partitionTable);
@@ -313,7 +328,7 @@ protected void appendBody(StringBuilder b) {
                 break;
             case PARTITION_BY:
                 if (partitioning != null) {
-                    b.append(partitioning);
+                    partitioning.appendTo(b, expressionPrinter);
                 } else {
                     toStringPartition(b);
                 }

diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/PartitionBound.java b/src/main/java/net/sf/jsqlparser/statement/create/table/PartitionBound.java
@@ -10,7 +10,9 @@
 package net.sf.jsqlparser.statement.create.table;
 
 import java.io.Serializable;
+import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 
 /** A PostgreSQL declarative-partition bound. */
@@ -113,17 +115,101 @@ public PartitionBound withRemainder(Expression remainder) {
 
     @Override
     public String toString() {
+        StringBuilder sql = new StringBuilder();
+        appendTo(sql, sql::append);
+        return sql.toString();
+    }
+
+    public void appendTo(StringBuilder sql, Consumer<Expression> expressionPrinter) {
         switch (type) {
             case RANGE:
-                return "FOR VALUES FROM (" + fromExpressions + ") TO (" + toExpressions + ")";
+                sql.append("FOR VALUES FROM (");
+                appendRangeValues(sql, fromExpressions, expressionPrinter);
+                sql.append(") TO (");
+                appendRangeValues(sql, toExpressions, expressionPrinter);
+                sql.append(')');
+                break;
             case LIST:
-                return "FOR VALUES IN (" + inExpressions + ")";
+                sql.append("FOR VALUES IN (");
+                expressionPrinter.accept(inExpressions);
+                sql.append(')');
+                break;
             case HASH:
-                return "FOR VALUES WITH (MODULUS " + modulus + ", REMAINDER " + remainder + ")";
+                sql.append("FOR VALUES WITH (MODULUS ");
+                expressionPrinter.accept(modulus);
+                sql.append(", REMAINDER ");
+                expressionPrinter.accept(remainder);
+                sql.append(')');
+                break;
             case DEFAULT:
-                return "DEFAULT";
+                sql.append("DEFAULT");
+                break;
+            default:
+                break;
+        }
+    }
+
+    /** Visits active bound expressions, excluding the MINVALUE/MAXVALUE range markers. */
+    public void visitExpressions(Consumer<Expression> expressions) {
+        if (type == null) {
+            return;
+        }
+        switch (type) {
+            case RANGE:
+                visitRangeValues(fromExpressions, expressions);
+                visitRangeValues(toExpressions, expressions);
+                break;
+            case LIST:
+                if (inExpressions != null) {
+                    expressions.accept(inExpressions);
+                }
+                break;
+            case HASH:
+                if (modulus != null) {
+                    expressions.accept(modulus);
+                }
+                if (remainder != null) {
+                    expressions.accept(remainder);
+                }
+                break;
             default:
-                return "";
+                break;
         }
     }
+
+    private static void visitRangeValues(ExpressionList<Expression> values,
+            Consumer<Expression> expressions) {
+        if (values != null) {
+            values.stream().filter(value -> !isRangeMarker(value)).forEach(expressions);
+        }
+    }
+
+    private static void appendRangeValues(StringBuilder sql, ExpressionList<Expression> values,
+            Consumer<Expression> expressions) {
+        if (values == null) {
+            sql.append("null");
+            return;
+        }
+        for (int i = 0; i < values.size(); i++) {
+            if (i > 0) {
+                sql.append(", ");
+            }
+            Expression value = values.get(i);
+            if (isRangeMarker(value)) {
+                sql.append(value);
+            } else {
+                expressions.accept(value);
+            }
+        }
+    }
+
+    private static boolean isRangeMarker(Expression expression) {
+        if (!(expression instanceof Column)) {
+            return false;
+        }
+        Column column = (Column) expression;
+        return column.getTable() == null && ("MINVALUE".equalsIgnoreCase(column.getColumnName())
+                || "MAXVALUE".equalsIgnoreCase(column.getColumnName()));
+    }
+
 }
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/TablePartitioning.java b/src/main/java/net/sf/jsqlparser/statement/create/table/TablePartitioning.java
@@ -15,6 +15,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.schema.Column;
@@ -256,14 +257,20 @@ public TablePartitioning addPartitionOptions(Collection<String> partitionOptions
 
     @Override
     public String toString() {
-        StringBuilder builder = new StringBuilder("PARTITION BY ");
-        appendMethod(builder);
+        StringBuilder builder = new StringBuilder();
+        appendTo(builder, builder::append);
+        return builder.toString();
+    }
+
+    public void appendTo(StringBuilder builder, Consumer<Expression> expressionPrinter) {
+        builder.append("PARTITION BY ");
+        appendMethod(builder, expressionPrinter);
         if (partitions != null) {
             builder.append(" PARTITIONS ").append(partitions);
         }
         if (subPartitioning != null) {
             builder.append(" SUBPARTITION BY ");
-            subPartitioning.appendMethod(builder);
+            subPartitioning.appendMethod(builder, expressionPrinter);
             if (subPartitioning.getPartitions() != null) {
                 builder.append(" SUBPARTITIONS ").append(subPartitioning.getPartitions());
             }
@@ -275,10 +282,9 @@ public String toString() {
         if (partitionOptions != null && !partitionOptions.isEmpty()) {
             builder.append(" ").append(PlainSelect.getStringList(partitionOptions, false, false));
         }
-        return builder.toString();
     }
 
-    private void appendMethod(StringBuilder builder) {
+    private void appendMethod(StringBuilder builder, Consumer<Expression> expressionPrinter) {
         if (linear) {
             builder.append("LINEAR ");
         }
@@ -291,11 +297,17 @@ private void appendMethod(StringBuilder builder) {
             builder.append(" COLUMNS");
         }
         if (expression != null) {
-            builder.append(" (").append(expression).append(")");
+            builder.append(" (");
+            expressionPrinter.accept(expression);
+            builder.append(')');
         } else if (expressionList != null) {
-            builder.append(" (").append(expressionList).append(")");
+            builder.append(" (");
+            expressionPrinter.accept(expressionList);
+            builder.append(')');
         } else if (columns != null) {
-            builder.append(" ").append(PlainSelect.getStringList(columns, true, true));
+            builder.append(" (");
+            expressionPrinter.accept(columns);
+            builder.append(')');
         }
     }
 }
diff --git a/src/main/java/net/sf/jsqlparser/util/TableDefinitionTraversal.java b/src/main/java/net/sf/jsqlparser/util/TableDefinitionTraversal.java
@@ -15,6 +15,7 @@
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.LikeClause;
 import net.sf.jsqlparser.statement.alter.AlterExpression;
+import net.sf.jsqlparser.statement.alter.AlterExpressionPartition;
 import net.sf.jsqlparser.statement.alter.AlterExpressionPrimaryKey;
 import net.sf.jsqlparser.statement.create.index.CreateIndex;
 import net.sf.jsqlparser.statement.create.table.CheckConstraint;
@@ -26,6 +27,8 @@
 import net.sf.jsqlparser.statement.create.table.ForeignKeyIndex;
 import net.sf.jsqlparser.statement.create.table.Index;
 import net.sf.jsqlparser.statement.create.table.TableElement;
+import net.sf.jsqlparser.statement.create.table.TablePartitioning;
+import net.sf.jsqlparser.statement.create.table.PartitionBound;
 
 /** Traverses structured table definitions without interpreting legacy raw column options. */
 public final class TableDefinitionTraversal {
@@ -50,6 +53,26 @@ public static void visit(AlterExpression action, Consumer<Expression> expression
         if (action.getIndex() != null) {
             visit(action.getIndex(), expressions, tables);
         }
+        if (action instanceof AlterExpressionPartition) {
+            AlterExpressionPartition partition = (AlterExpressionPartition) action;
+            switch (partition.getOperation()) {
+                case ATTACH_PARTITION:
+                    accept(partition.getPartitionTable(), tables);
+                    visit(partition.getPartitionBound(), expressions);
+                    break;
+                case DETACH_PARTITION:
+                    accept(partition.getPartitionTable(), tables);
+                    break;
+                case EXCHANGE_PARTITION:
+                    accept(partition.getExchangeTable(), tables);
+                    break;
+                case PARTITION_BY:
+                    visit(partition.getPartitioning(), expressions);
+                    break;
+                default:
+                    break;
+            }
+        }
         if (action instanceof AlterExpressionPrimaryKey) {
             AlterExpressionPrimaryKey primaryKey = (AlterExpressionPrimaryKey) action;
             if (primaryKey.isUsingHash()) {
@@ -72,6 +95,30 @@ public static void visit(CreateTable table, Consumer<Expression> expressions,
         }
         accept(table.getTrailingLikeTable(), tables);
         accept(table.getPartitionOf(), tables);
+        visit(table.getPartitioning(), expressions);
+        visit(table.getPartitionBound(), expressions);
+    }
+
+    /** Visits the active partition key and any subpartition key. Raw bounds remain opaque. */
+    public static void visit(TablePartitioning partitioning, Consumer<Expression> expressions) {
+        if (partitioning == null) {
+            return;
+        }
+        if (partitioning.getExpression() != null) {
+            accept(partitioning.getExpression(), expressions);
+        } else if (partitioning.getExpressionList() != null) {
+            accept(partitioning.getExpressionList(), expressions);
+        } else {
+            accept(partitioning.getColumns(), expressions);
+        }
+        visit(partitioning.getSubPartitioning(), expressions);
+    }
+
+    /** Visits expressions belonging to the selected PostgreSQL bound type. */
+    public static void visit(PartitionBound bound, Consumer<Expression> expressions) {
+        if (bound != null) {
+            bound.visitExpressions(expressions);
+        }
     }
 
     public static void visit(TableElement element, Consumer<Expression> expressions,

diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/AlterDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/AlterDeParser.java
@@ -12,6 +12,7 @@
 import net.sf.jsqlparser.statement.alter.Alter;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 import net.sf.jsqlparser.statement.alter.AlterExpression;
+import net.sf.jsqlparser.statement.alter.AlterExpressionPartition;
 import net.sf.jsqlparser.statement.alter.AlterExpressionPrimaryKey;
 import net.sf.jsqlparser.statement.create.table.DefaultConstraint;
 import net.sf.jsqlparser.statement.select.PlainSelect;
@@ -49,6 +50,11 @@ public void deParse(Alter alter) {
     }
 
     private void deParseAction(AlterExpression action) {
+        if (action instanceof AlterExpressionPartition) {
+            ((AlterExpressionPartition) action).appendTo(builder,
+                    expression -> expression.accept(expressionVisitor, null));
+            return;
+        }
         if (action instanceof AlterExpressionPrimaryKey) {
             ((AlterExpressionPrimaryKey) action).appendTo(builder,
                     expression -> expression.accept(expressionVisitor, null));

diff --git a/src/main/java/net/sf/jsqlparser/util/deparser/CreateTableDeParser.java b/src/main/java/net/sf/jsqlparser/util/deparser/CreateTableDeParser.java
@@ -105,15 +105,21 @@ public void deParse(CreateTable createTable) {
         }
 
         if (createTable.getPartitionBound() != null) {
-            builder.append(' ').append(createTable.getPartitionBound());
+            builder.append(' ');
+            createTable.getPartitionBound().appendTo(builder,
+                    expression -> expression.accept(statementDeParser.getExpressionDeParser(),
+                            null));
         }
 
         params = PlainSelect.getStringList(createTable.getTableOptionsStrings(), false, false);
         if (!"".equals(params)) {
             builder.append(' ').append(params);
         }
         if (createTable.getPartitioning() != null) {
-            builder.append(' ').append(createTable.getPartitioning());
+            builder.append(' ');
+            createTable.getPartitioning().appendTo(builder,
+                    expression -> expression.accept(statementDeParser.getExpressionDeParser(),
+                            null));
         }
 
         if (createTable.getRowMovement() != null) {