Merge branch 'master' into feature/duckdb-syntax

Author: hayssams

.codacy.yml

@@ -4,5 +4,8 @@ engines:
     exclude_paths:
       # These fixtures use PostgreSQL grammar, not Transact-SQL.
       - "src/test/resources/postgresql/**"
+      # MATCH_RECOGNIZE fixtures use Oracle and BigQuery grammar.
+      - "src/test/resources/net/sf/jsqlparser/statement/select/match-recognize/**"
+      - "src/test/resources/net/sf/jsqlparser/statement/select/match-recognize-2350.sql"
 exclude_paths:
   - "site/**"

.gitignore

@@ -7,11 +7,11 @@
 /src/site/sphinx/_themes
 
 # Exclude the Auto-generated Changelog
-/src/site/sphinx/changelog.rst
-/src/site/sphinx/syntax_stable.rst
-/src/site/sphinx/syntax_snapshot.rst
-/src/site/sphinx/javadoc_stable.xml
-/src/site/sphinx/javadoc_snapshot.xml
+src/site/sphinx/changelog.rst
+src/site/sphinx/syntax_stable.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

CHANGELOG.md

@@ -140,6 +140,7 @@ and missing syntax gets added on demand — [open an issue](https://github.com/J
 |---|---|
 | **Queries** | `SELECT` · `WITH …` · Piped SQL |
 | **ksqlDB windows** | JOIN `WITHIN`, window `GRACE PERIOD`, and `EMIT CHANGES`/`FINAL` |
+| **ClickHouse column selection** | `COLUMNS('regexp')` select items with chained `APPLY`, `EXCEPT`, and `REPLACE` transformers |
 | **DML** | `INSERT` · `UPDATE` · `UPSERT` · `MERGE` · `DELETE` · `TRUNCATE TABLE` |
 | **DDL** | `CREATE …` · `ALTER …` · `DROP …` |
 | **PostgreSQL RLS** | `CREATE POLICY` · `ALTER TABLE … ENABLE`/`DISABLE`/`FORCE`/`NO FORCE ROW LEVEL SECURITY` |

README.md

@@ -0,0 +1,84 @@
+/*-
+ * #%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.expression;
+
+import java.util.ArrayList;
+import java.util.List;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+/**
+ * A ClickHouse {@code COLUMNS('regexp')} matcher with one or more transformers, for example
+ * {@code COLUMNS('^metric_') APPLY(x -> round(x, 2))}.
+ *
+ * Without a transformer, {@code COLUMNS('regexp')} keeps parsing as a regular
+ * {@link net.sf.jsqlparser.expression.Function}.
+ */
+public class ColumnsExpression extends ASTNodeAccessImpl implements Expression {
+
+    private Expression columns;
+    private List<ColumnsTransformer> transformers;
+
+    public ColumnsExpression(Expression columns) {
+        this.columns = columns;
+        this.transformers = new ArrayList<>();
+    }
+
+    public ColumnsExpression(Expression columns, List<ColumnsTransformer> transformers) {
+        this.columns = columns;
+        this.transformers = transformers;
+    }
+
+    public Expression getColumns() {
+        return columns;
+    }
+
+    public ColumnsExpression setColumns(Expression columns) {
+        this.columns = columns;
+        return this;
+    }
+
+    public List<ColumnsTransformer> getTransformers() {
+        return transformers;
+    }
+
+    public ColumnsExpression setTransformers(List<ColumnsTransformer> transformers) {
+        this.transformers = transformers;
+        return this;
+    }
+
+    public List<Expression> getAllExpressions() {
+        List<Expression> expressions = new ArrayList<>();
+        if (columns != null) {
+            expressions.add(columns);
+        }
+        for (ColumnsTransformer transformer : transformers) {
+            transformer.collectExpressions(expressions);
+        }
+        return expressions;
+    }
+
+    public StringBuilder appendTo(StringBuilder builder) {
+        builder.append(columns);
+        for (ColumnsTransformer transformer : transformers) {
+            builder.append(" ").append(transformer);
+        }
+        return builder;
+    }
+
+    @Override
+    public String toString() {
+        return appendTo(new StringBuilder()).toString();
+    }
+
+    @Override
+    public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S context) {
+        return expressionVisitor.visit(this, context);
+    }
+}

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

@@ -0,0 +1,121 @@
+/*-
+ * #%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.expression;
+
+import java.util.List;
+import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+import net.sf.jsqlparser.schema.Column;
+import net.sf.jsqlparser.statement.select.Select;
+import net.sf.jsqlparser.statement.select.SelectItem;
+
+/**
+ * A ClickHouse transformer following a {@code COLUMNS(...)} matcher, for example the
+ * {@code APPLY(x -> round(x, 2))} in {@code SELECT COLUMNS('^m') APPLY(x -> round(x, 2))}.
+ *
+ * ClickHouse parses its transformers in a loop, so they may repeat and combine in any order.
+ */
+public class ColumnsTransformer extends ASTNodeAccessImpl {
+
+    public enum ColumnsTransformerType {
+        APPLY, EXCEPT, REPLACE
+    }
+
+    private ColumnsTransformerType type;
+    private Expression applyExpression;
+    private ParenthesedExpressionList<Column> exceptColumns;
+    private List<SelectItem<?>> replaceItems;
+
+    public ColumnsTransformer(ColumnsTransformerType type) {
+        this.type = type;
+    }
+
+    public ColumnsTransformerType getType() {
+        return type;
+    }
+
+    public ColumnsTransformer setType(ColumnsTransformerType type) {
+        this.type = type;
+        return this;
+    }
+
+    public Expression getApplyExpression() {
+        return applyExpression;
+    }
+
+    public ColumnsTransformer setApplyExpression(Expression applyExpression) {
+        this.applyExpression = applyExpression;
+        return this;
+    }
+
+    public ParenthesedExpressionList<Column> getExceptColumns() {
+        return exceptColumns;
+    }
+
+    public ColumnsTransformer setExceptColumns(ParenthesedExpressionList<Column> exceptColumns) {
+        this.exceptColumns = exceptColumns;
+        return this;
+    }
+
+    public List<SelectItem<?>> getReplaceItems() {
+        return replaceItems;
+    }
+
+    public ColumnsTransformer setReplaceItems(List<SelectItem<?>> replaceItems) {
+        this.replaceItems = replaceItems;
+        return this;
+    }
+
+    void collectExpressions(List<Expression> expressions) {
+        switch (type) {
+            case APPLY:
+                if (applyExpression != null) {
+                    expressions.add(applyExpression);
+                }
+                break;
+            case EXCEPT:
+                if (exceptColumns != null) {
+                    expressions.addAll(exceptColumns);
+                }
+                break;
+            case REPLACE:
+                if (replaceItems != null) {
+                    for (SelectItem<?> item : replaceItems) {
+                        expressions.add(item.getExpression());
+                    }
+                }
+                break;
+            default:
+                throw new IllegalStateException("Unhandled ColumnsTransformerType: " + type);
+        }
+    }
+
+    public StringBuilder appendTo(StringBuilder builder) {
+        switch (type) {
+            case APPLY:
+                builder.append("APPLY(").append(applyExpression).append(")");
+                break;
+            case EXCEPT:
+                builder.append("EXCEPT ").append(exceptColumns);
+                break;
+            case REPLACE:
+                builder.append("REPLACE(").append(Select.getStringList(replaceItems)).append(")");
+                break;
+            default:
+                throw new IllegalStateException("Unhandled ColumnsTransformerType: " + type);
+        }
+        return builder;
+    }
+
+    @Override
+    public String toString() {
+        return appendTo(new StringBuilder()).toString();
+    }
+}

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

@@ -510,6 +510,14 @@ default void visit(ExtractExpression extractExpression) {
         this.visit(extractExpression, null);
     }
 
+    default <S> T visit(RowPatternFunction function, S context) {
+        return function.getFunction().accept(this, context);
+    }
+
+    default void visit(RowPatternFunction function) {
+        visit(function, null);
+    }
+
     <S> T visit(IntervalExpression intervalExpression, S context);
 
     default void visit(IntervalExpression intervalExpression) {
@@ -805,6 +813,19 @@ default void visit(LambdaExpression lambdaExpression) {
         this.visit(lambdaExpression, null);
     }
 
+    default <S> T visit(ColumnsExpression columnsExpression, S context) {
+        for (Expression expression : columnsExpression.getAllExpressions()) {
+            if (expression != null) {
+                expression.accept(this, context);
+            }
+        }
+        return null;
+    }
+
+    default void visit(ColumnsExpression columnsExpression) {
+        this.visit(columnsExpression, null);
+    }
+
     <S> T visit(HighExpression highExpression, S context);
 
     default void visit(HighExpression highExpression) {

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

@@ -875,6 +875,11 @@ public <S> T visit(LambdaExpression lambdaExpression, S context) {
         return lambdaExpression.getExpression().accept(this, context);
     }
 
+    @Override
+    public <S> T visit(ColumnsExpression columnsExpression, S context) {
+        return visitExpressions(columnsExpression, context, columnsExpression.getAllExpressions());
+    }
+
     @Override
     public <S> T visit(HighExpression highExpression, S context) {
         return highExpression.getExpression().accept(this, context);

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

@@ -0,0 +1,63 @@
+/*-
+ * #%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.expression;
+
+import java.util.function.Consumer;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+/** An explicit RUNNING or FINAL evaluation mode on a row-pattern function. */
+public class RowPatternFunction extends ASTNodeAccessImpl implements Expression {
+    public enum EvaluationMode {
+        RUNNING, FINAL
+    }
+
+    private EvaluationMode evaluationMode;
+    private Function function;
+
+    public RowPatternFunction(EvaluationMode evaluationMode, Function function) {
+        this.evaluationMode = evaluationMode;
+        this.function = function;
+    }
+
+    public EvaluationMode getEvaluationMode() {
+        return evaluationMode;
+    }
+
+    public RowPatternFunction setEvaluationMode(EvaluationMode mode) {
+        evaluationMode = mode;
+        return this;
+    }
+
+    public Function getFunction() {
+        return function;
+    }
+
+    public RowPatternFunction setFunction(Function function) {
+        this.function = function;
+        return this;
+    }
+
+    @Override
+    public <T, S> T accept(ExpressionVisitor<T> visitor, S context) {
+        return visitor.visit(this, context);
+    }
+
+    public StringBuilder appendTo(StringBuilder builder, Consumer<Expression> expressions) {
+        builder.append(evaluationMode).append(' ');
+        expressions.accept(function);
+        return builder;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        return appendTo(builder, expression -> builder.append(expression)).toString();
+    }
+}