Merge branch 'master' into manticore

Author: manticore-projects

README.md

@@ -80,7 +80,7 @@ As per March-2026, the productions `Condition()`, `RegularCondition()` and `AndE
 
 ```text
 Benchmark                               (version)  Mode  Cnt   Score   Error  Units
-JSQLParserBenchmark.parseSQLStatements     latest  avgt   15  33.995 ± 0.764  ms/op <-- March/26
+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
 ```

src/main/java/net/sf/jsqlparser/statement/create/index/CreateIndex.java

@@ -12,7 +12,6 @@
 import static java.util.stream.Collectors.joining;
 
 import java.util.*;
-
 import net.sf.jsqlparser.schema.*;
 import net.sf.jsqlparser.statement.*;
 import net.sf.jsqlparser.statement.create.table.*;
@@ -106,9 +105,7 @@ public String toString() {
 
             buffer.append(
                     index.getColumns().stream()
-                            .map(cp -> cp.columnName + (cp.getParams() != null
-                                    ? " " + String.join(" ", cp.getParams())
-                                    : ""))
+                            .map(Index.ColumnParams::toString)
                             .collect(joining(", ")));
 
             buffer.append(")");

src/main/java/net/sf/jsqlparser/statement/create/table/Index.java

@@ -17,7 +17,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-
+import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
 public class Index implements Serializable {
@@ -32,7 +32,7 @@ public class Index implements Serializable {
 
     public List<String> getColumnsNames() {
         return columns.stream()
-                .map(col -> col.columnName)
+                .map(ColumnParams::getColumnName)
                 .collect(toList());
     }
 
@@ -202,28 +202,52 @@ public void setCommentText(String commentText) {
     public static class ColumnParams implements Serializable {
         public final String columnName;
         public final List<String> params;
+        private final Expression expression;
 
         public ColumnParams(String columnName) {
             this.columnName = columnName;
             this.params = null;
+            this.expression = null;
         }
 
         public ColumnParams(String columnName, List<String> params) {
             this.columnName = columnName;
             this.params = params;
+            this.expression = null;
+        }
+
+        public ColumnParams(Expression expression) {
+            this.columnName = null;
+            this.params = null;
+            this.expression = expression;
+        }
+
+        public ColumnParams(Expression expression, List<String> params) {
+            this.columnName = null;
+            this.params = params;
+            this.expression = expression;
         }
 
         public String getColumnName() {
-            return columnName;
+            return expression != null ? expression.toString() : columnName;
         }
 
         public List<String> getParams() {
             return params;
         }
 
+        public Expression getExpression() {
+            return expression;
+        }
+
+        public boolean isExpression() {
+            return expression != null;
+        }
+
         @Override
         public String toString() {
-            return columnName + (params != null ? " " + String.join(" ", params) : "");
+            String head = expression != null ? "(" + expression + ")" : columnName;
+            return head + (params != null ? " " + String.join(" ", params) : "");
         }
     }
 }

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

@@ -54,9 +54,7 @@ public void deParse(CreateIndex createIndex) {
         if (index.getColumnsNames() != null) {
             builder.append(" (");
             builder.append(index.getColumnWithParams().stream()
-                    .map(cp -> cp.columnName
-                            + (cp.getParams() != null ? " " + String.join(" ", cp.getParams())
-                                    : ""))
+                    .map(Index.ColumnParams::toString)
                     .collect(joining(", ")));
             builder.append(")");
         }

src/main/java/net/sf/jsqlparser/util/validation/validator/AlterValidator.java

@@ -9,8 +9,9 @@
  */
 package net.sf.jsqlparser.util.validation.validator;
 
-import java.util.EnumSet;
+import static java.util.stream.Collectors.toList;
 
+import java.util.EnumSet;
 import net.sf.jsqlparser.parser.feature.Feature;
 import net.sf.jsqlparser.statement.alter.Alter;
 import net.sf.jsqlparser.statement.alter.AlterExpression;
@@ -74,7 +75,11 @@ public void validate(Alter alter, AlterExpression e) {
             if (e.getIndex() != null) {
                 validateName(c, NamedObject.index, e.getIndex().getName());
                 if (e.getIndex().getColumns() != null) {
-                    validateOptionalColumnNames(c, e.getIndex().getColumnsNames(),
+                    validateOptionalColumnNames(c,
+                            e.getIndex().getColumns().stream()
+                                    .filter(cp -> !cp.isExpression())
+                                    .map(cp -> cp.getColumnName())
+                                    .collect(toList()),
                             NamedObject.index);
                 }
             }

src/main/java/net/sf/jsqlparser/util/validation/validator/CreateIndexValidator.java

@@ -9,11 +9,13 @@
  */
 package net.sf.jsqlparser.util.validation.validator;
 
+import static java.util.stream.Collectors.toList;
+
 import net.sf.jsqlparser.parser.feature.Feature;
 import net.sf.jsqlparser.statement.create.index.CreateIndex;
 import net.sf.jsqlparser.statement.create.table.Index;
-import net.sf.jsqlparser.util.validation.metadata.NamedObject;
 import net.sf.jsqlparser.util.validation.ValidationCapability;
+import net.sf.jsqlparser.util.validation.metadata.NamedObject;
 
 /**
  * @author gitmotte
@@ -27,7 +29,14 @@ public void validate(CreateIndex createIndex) {
             validateFeature(c, Feature.createIndex);
             validateName(c, NamedObject.table, createIndex.getTable().getFullyQualifiedName());
             validateName(c, NamedObject.index, index.getName(), false);
-            validateOptionalColumnNames(c, index.getColumnsNames(), NamedObject.table);
+            if (index.getColumns() != null) {
+                validateOptionalColumnNames(c,
+                        index.getColumns().stream()
+                                .filter(cp -> !cp.isExpression())
+                                .map(Index.ColumnParams::getColumnName)
+                                .collect(toList()),
+                        NamedObject.table);
+            }
         }
     }