Merge branch 'master' into manticore

Author: manticore-projects

README.md

@@ -3,7 +3,7 @@
 [![CI](https://github.com/JSQLParser/JSqlParser/actions/workflows/ci.yml/badge.svg)](https://github.com/JSQLParser/JSqlParser/actions/workflows/ci.yml)
 [![Coverage Status](https://coveralls.io/repos/JSQLParser/JSqlParser/badge.svg?branch=master)](https://coveralls.io/r/JSQLParser/JSqlParser?branch=master)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/6f9a2d7eb98f45969749e101322634a1)](https://www.codacy.com/gh/JSQLParser/JSqlParser/dashboard?utm_source=github.com&utm_medium=referral&utm_content=JSQLParser/JSqlParser&utm_campaign=Badge_Grade)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.jsqlparser/jsqlparser/badge.svg)](http://maven-badges.herokuapp.com/maven-central/com.github.jsqlparser/jsqlparser) [![Javadocs](https://www.javadoc.io/badge/com.github.jsqlparser/jsqlparser.svg)](https://www.javadoc.io/doc/com.github.jsqlparser/jsqlparser)
+[![Maven Central](https://img.shields.io/maven-central/v/com.github.jsqlparser/jsqlparser.svg?label=maven-central)](https://central.sonatype.com/artifact/com.github.jsqlparser/jsqlparser) [![Javadocs](https://www.javadoc.io/badge/com.github.jsqlparser/jsqlparser.svg)](https://www.javadoc.io/doc/com.github.jsqlparser/jsqlparser)
 [![Gitter](https://badges.gitter.im/JSQLParser/JSqlParser.svg)](https://gitter.im/JSQLParser/JSqlParser?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 A huge thank you to our sponsor, [Starlake.ai](https://starlake.ai/) who simplifies data ingestion, transformation, and orchestration, enabling faster delivery of high-quality data. Starlake has been instrumental in providing Piped SQL and numerous test cases for BigQuery, Redshift, DataBricks, and DuckDB. Show your support for ongoing development by visiting Starlake.ai and giving us a star!

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

@@ -112,6 +112,9 @@ public <S> T visit(Function function, S context) {
         if (function.getParameters() != null) {
             subExpressions.addAll(function.getParameters());
         }
+        if (function.getChainedParameters() != null) {
+            subExpressions.addAll(function.getChainedParameters());
+        }
         if (function.getKeep() != null) {
             subExpressions.add(function.getKeep());
         }

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

@@ -26,6 +26,7 @@
 public class Function extends ASTNodeAccessImpl implements Expression {
     private List<String> nameparts;
     private ExpressionList<?> parameters;
+    private ExpressionList<?> chainedParameters;
     private NamedExpressionList<?> namedParameters;
     private boolean allColumns = false;
     private boolean distinct = false;
@@ -192,6 +193,20 @@ public void setParameters(ExpressionList<?> list) {
         parameters = list;
     }
 
+    /**
+     * Additional function-call parameters for dialects that support chained function calls, e.g.
+     * quantile(0.95)(cost) in ClickHouse.
+     *
+     * @return the chained parameters of the function (if any, else null)
+     */
+    public ExpressionList<?> getChainedParameters() {
+        return chainedParameters;
+    }
+
+    public void setChainedParameters(ExpressionList<?> chainedParameters) {
+        this.chainedParameters = chainedParameters;
+    }
+
     /**
      * the parameters might be named parameters, e.g. substring('foobar' from 2 for 3)
      *
@@ -335,6 +350,10 @@ public String toString() {
 
         String ans = getName() + params;
 
+        if (chainedParameters != null) {
+            ans += "(" + chainedParameters + ")";
+        }
+
         if (nullHandling != null && isIgnoreNullsOutside()) {
             switch (nullHandling) {
                 case IGNORE_NULLS:
@@ -393,6 +412,11 @@ public Function withParameters(Expression... parameters) {
         return withParameters(new ExpressionList<>(parameters));
     }
 
+    public Function withChainedParameters(ExpressionList<?> chainedParameters) {
+        this.setChainedParameters(chainedParameters);
+        return this;
+    }
+
     public Function withNamedParameters(NamedExpressionList<?> namedParameters) {
         this.setNamedParameters(namedParameters);
         return this;

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

@@ -134,6 +134,7 @@ public class ParserKeywordsUtils {
             {"SELECT", RESTRICTED_ALIAS},
             {"SEMI", RESTRICTED_JSQLPARSER},
             {"SET", RESTRICTED_JSQLPARSER},
+            {"SETTINGS", RESTRICTED_JSQLPARSER},
             {"SOME", RESTRICTED_JSQLPARSER},
             {"START", RESTRICTED_JSQLPARSER},
             {"STATEMENT", RESTRICTED_JSQLPARSER},

src/main/java/net/sf/jsqlparser/schema/Column.java

@@ -12,12 +12,12 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
 import net.sf.jsqlparser.expression.ArrayConstructor;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 import net.sf.jsqlparser.expression.operators.relational.SupportsOldOracleJoinSyntax;
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+import net.sf.jsqlparser.statement.ReturningReferenceType;
 
 /**
  * A column. It can have the table name it belongs to.
@@ -30,6 +30,8 @@ public class Column extends ASTNodeAccessImpl implements Expression, MultiPartNa
     private ArrayConstructor arrayConstructor;
     private String tableDelimiter = ".";
     private int oldOracleJoinSyntax = SupportsOldOracleJoinSyntax.NO_ORACLE_JOIN;
+    private ReturningReferenceType returningReferenceType = null;
+    private String returningQualifier = null;
 
     // holds the physical table when resolved against an actual schema information
     private Table resolvedTable = null;
@@ -215,7 +217,9 @@ public String getUnquotedName() {
     public String getFullyQualifiedName(boolean aliases) {
         StringBuilder fqn = new StringBuilder();
 
-        if (table != null) {
+        if (returningQualifier != null) {
+            fqn.append(returningQualifier);
+        } else if (table != null) {
             if (table.getAlias() != null && aliases) {
                 fqn.append(table.getAlias().getName());
             } else {
@@ -284,6 +288,31 @@ public Column withOldOracleJoinSyntax(int oldOracleJoinSyntax) {
         return this;
     }
 
+    public ReturningReferenceType getReturningReferenceType() {
+        return returningReferenceType;
+    }
+
+    public Column setReturningReferenceType(ReturningReferenceType returningReferenceType) {
+        this.returningReferenceType = returningReferenceType;
+        return this;
+    }
+
+    public String getReturningQualifier() {
+        return returningQualifier;
+    }
+
+    public Column setReturningQualifier(String returningQualifier) {
+        this.returningQualifier = returningQualifier;
+        return this;
+    }
+
+    public Column withReturningReference(ReturningReferenceType returningReferenceType,
+            String returningQualifier) {
+        this.returningReferenceType = returningReferenceType;
+        this.returningQualifier = returningQualifier;
+        return this;
+    }
+
     public String getCommentText() {
         return commentText;
     }

src/main/java/net/sf/jsqlparser/statement/ExplainStatement.java

@@ -13,16 +13,14 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.stream.Collectors;
-
 import net.sf.jsqlparser.schema.Table;
-import net.sf.jsqlparser.statement.select.Select;
 
 /**
  * An {@code EXPLAIN} statement
  */
 public class ExplainStatement implements Statement {
     private String keyword;
-    private Select select;
+    private Statement statement;
     private LinkedHashMap<OptionType, Option> options;
     private Table table;
 
@@ -37,24 +35,17 @@ public ExplainStatement() {
     public ExplainStatement(String keyword, Table table) {
         this.keyword = keyword;
         this.table = table;
-        this.select = null;
     }
 
-    public ExplainStatement(String keyword, Select select, List<Option> optionList) {
+    public ExplainStatement(String keyword, Statement statement, List<Option> optionList) {
         this.keyword = keyword;
-        this.select = select;
-        this.table = null;
+        setStatement(statement);
 
-        if (optionList != null && !optionList.isEmpty()) {
-            options = new LinkedHashMap<>();
-            for (Option o : optionList) {
-                options.put(o.getType(), o);
-            }
-        }
+        initializeOptions(optionList);
     }
 
-    public ExplainStatement(Select select) {
-        this("EXPLAIN", select, null);
+    public ExplainStatement(Statement statement) {
+        this("EXPLAIN", statement, null);
     }
 
     public Table getTable() {
@@ -63,15 +54,20 @@ public Table getTable() {
 
     public ExplainStatement setTable(Table table) {
         this.table = table;
+        if (table != null) {
+            this.statement = null;
+        }
         return this;
     }
 
-    public Select getStatement() {
-        return select;
+    public Statement getStatement() {
+        return statement;
     }
 
-    public void setStatement(Select select) {
-        this.select = select;
+    public ExplainStatement setStatement(Statement statement) {
+        this.table = null;
+        this.statement = statement;
+        return this;
     }
 
     public LinkedHashMap<OptionType, Option> getOptions() {
@@ -122,8 +118,8 @@ public String toString() {
             }
 
             builder.append(" ");
-            if (select != null) {
-                select.appendTo(builder);
+            if (statement != null) {
+                builder.append(statement);
             }
         }
 
@@ -135,6 +131,15 @@ public <T, S> T accept(StatementVisitor<T> statementVisitor, S context) {
         return statementVisitor.visit(this, context);
     }
 
+    private void initializeOptions(List<Option> optionList) {
+        if (optionList != null && !optionList.isEmpty()) {
+            options = new LinkedHashMap<>();
+            for (Option o : optionList) {
+                options.put(o.getType(), o);
+            }
+        }
+    }
+
     public enum OptionType {
         ANALYZE, VERBOSE, COSTS, BUFFERS, FORMAT, PLAN, PLAN_FOR;