Merge branch 'master' into manticore

Author: manticore-projects

.github/dependabot.yml

@@ -781,4 +781,10 @@ default void visit(Inverse inverse) {
     <S> T visit(FromQuery fromQuery, S context);
 
     <S> T visit(DateUnitExpression dateUnitExpression, S context);
+
+    <S> T visit(PostgresNamedFunctionParameter postgresNamedFunctionParameter, S context);
+
+    default void visit(PostgresNamedFunctionParameter postgresNamedFunctionParameter) {
+        this.visit(postgresNamedFunctionParameter, null);
+    }
 }

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

@@ -743,6 +743,11 @@ public <S> T visit(OracleNamedFunctionParameter oracleNamedFunctionParameter, S
         return oracleNamedFunctionParameter.getExpression().accept(this, context);
     }
 
+    @Override
+    public <S> T visit(PostgresNamedFunctionParameter postgresNamedFunctionParameter, S context) {
+        return postgresNamedFunctionParameter.getExpression().accept(this, context);
+    }
+
     @Override
     public <S> T visit(GeometryDistance geometryDistance, S context) {
         return visitBinaryExpression(geometryDistance, context);

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

@@ -0,0 +1,55 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2021 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.expression;
+
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+import java.util.Objects;
+
+/**
+ * @author <a href="mailto:andreas@manticore-projects.com">Andreas Reichel</a>
+ */
+public class PostgresNamedFunctionParameter extends ASTNodeAccessImpl implements Expression {
+    private final String name;
+    private final Expression expression;
+
+    public PostgresNamedFunctionParameter(String name, Expression expression) {
+        this.name = Objects.requireNonNull(name,
+                "The NAME of the PostgresNamedFunctionParameter must not be null.");
+        this.expression = Objects.requireNonNull(expression,
+                "The EXPRESSION of the PostgresNamedFunctionParameter must not be null.");
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Expression getExpression() {
+        return expression;
+    }
+
+    @Override
+    public <T, S> T accept(ExpressionVisitor<T> expressionVisitor, S context) {
+        return expressionVisitor.visit(this, context);
+    }
+
+    public StringBuilder appendTo(StringBuilder builder) {
+        builder.append(name)
+                .append(" := ")
+                .append(expression);
+
+        return builder;
+    }
+
+    @Override
+    public String toString() {
+        return appendTo(new StringBuilder()).toString();
+    }
+}

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

@@ -121,6 +121,7 @@ public class ParserKeywordsUtils {
             {"OVERWRITE ", RESTRICTED_JSQLPARSER},
             {"PIVOT", RESTRICTED_JSQLPARSER},
             {"PREFERRING", RESTRICTED_JSQLPARSER},
+            {"PREWHERE", RESTRICTED_JSQLPARSER},
             {"PRIOR", RESTRICTED_ALIAS},
             {"PROCEDURE", RESTRICTED_ALIAS},
             {"PUBLIC", RESTRICTED_ALIAS},

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

@@ -37,6 +37,7 @@ public class Join extends ASTNodeAccessImpl {
     private boolean semi = false;
     private boolean straight = false;
     private boolean apply = false;
+    private boolean fetch = false;
     private FromItem fromItem;
     private KSQLJoinWindow joinWindow;
 
@@ -149,6 +150,24 @@ public Join withApply(boolean apply) {
         return this;
     }
 
+    /**
+     * Whether is a "FETCH" join (JPQL/HQL)
+     *
+     * @return true if is a "FETCH" join
+     */
+    public boolean isFetch() {
+        return fetch;
+    }
+
+    public void setFetch(boolean b) {
+        fetch = b;
+    }
+
+    public Join withFetch(boolean b) {
+        this.setFetch(b);
+        return this;
+    }
+
     /**
      * Whether is a "SEMI" join
      *
@@ -277,10 +296,12 @@ public Join withCross(boolean cross) {
     /**
      * Returns the right item of the join
      */
+    @Deprecated
     public FromItem getRightItem() {
         return fromItem;
     }
 
+    @Deprecated
     public void setRightItem(FromItem item) {
         fromItem = item;
     }
@@ -427,6 +448,9 @@ public String toString() {
                     builder.append(joinHint).append(" ");
                 }
                 builder.append("JOIN ");
+                if (fetch) {
+                    builder.append("FETCH ");
+                }
             }
 
             builder.append(fromItem).append((joinWindow != null) ? " WITHIN " + joinWindow : "");

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

@@ -37,6 +37,7 @@ public class PlainSelect extends Select {
     private FromItem fromItem;
     private List<LateralView> lateralViews;
     private List<Join> joins;
+    private Expression preWhere;
     private Expression where;
     private GroupByElement groupBy;
     private Expression having;
@@ -160,6 +161,14 @@ public void setWhere(Expression where) {
         this.where = where;
     }
 
+    public Expression getPreWhere() {
+        return preWhere;
+    }
+
+    public void setPreWhere(Expression preWhere) {
+        this.preWhere = preWhere;
+    }
+
     public PlainSelect withFromItem(FromItem item) {
         this.setFromItem(item);
         return this;
@@ -569,6 +578,9 @@ public StringBuilder appendSelectBodyTo(StringBuilder builder) {
             if (ksqlWindow != null) {
                 builder.append(" WINDOW ").append(ksqlWindow);
             }
+            if (preWhere != null) {
+                builder.append(" PREWHERE ").append(preWhere);
+            }
             if (where != null) {
                 builder.append(" WHERE ").append(where);
             }
@@ -597,6 +609,9 @@ public StringBuilder appendSelectBodyTo(StringBuilder builder) {
             }
         } else {
             // without from
+            if (preWhere != null) {
+                builder.append(" PREWHERE ").append(preWhere);
+            }
             if (where != null) {
                 builder.append(" WHERE ").append(where);
             }
@@ -669,6 +684,11 @@ public PlainSelect withWhere(Expression where) {
         return this;
     }
 
+    public PlainSelect withPreWhere(Expression preWhere) {
+        this.setPreWhere(preWhere);
+        return this;
+    }
+
     public PlainSelect withOptimizeFor(OptimizeFor optimizeFor) {
         this.setOptimizeFor(optimizeFor);
         return this;
@@ -767,6 +787,10 @@ public <E extends Expression> E getWhere(Class<E> type) {
         return type.cast(getWhere());
     }
 
+    public <E extends Expression> E getPreWhere(Class<E> type) {
+        return type.cast(getPreWhere());
+    }
+
     public <E extends Expression> E getHaving(Class<E> type) {
         return type.cast(getHaving());
     }

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

@@ -151,6 +151,7 @@ public <S> T visit(PlainSelect plainSelect, S context) {
         // //@todo: implement
         // }
 
+        expressionVisitor.visitExpression(plainSelect.getPreWhere(), context);
         expressionVisitor.visitExpression(plainSelect.getWhere(), context);
 
         // if (plainSelect.getOracleHierarchical() != null) {

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

@@ -317,6 +317,9 @@ public <S> Void visit(PlainSelect plainSelect, S context) {
         }
 
         visitJoins(plainSelect.getJoins(), context);
+        if (plainSelect.getPreWhere() != null) {
+            plainSelect.getPreWhere().accept(this, context);
+        }
         if (plainSelect.getWhere() != null) {
             plainSelect.getWhere().accept(this, context);
         }
@@ -1379,7 +1382,6 @@ private <S> void visitJoins(List<Join> joins, S context) {
         }
         for (Join join : joins) {
             join.getFromItem().accept(this, context);
-            join.getRightItem().accept(this, context);
             for (Expression expression : join.getOnExpressions()) {
                 expression.accept(this, context);
             }
@@ -1759,6 +1761,13 @@ public <S> Void visit(OracleNamedFunctionParameter oracleNamedFunctionParameter,
         return null;
     }
 
+    @Override
+    public <S> Void visit(PostgresNamedFunctionParameter postgresNamedFunctionParameter,
+            S context) {
+        postgresNamedFunctionParameter.getExpression().accept(this, context);
+        return null;
+    }
+
     @Override
     public <S> Void visit(RenameTableStatement renameTableStatement, S context) {
         for (Map.Entry<Table, Table> e : renameTableStatement.getTableNames()) {

src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java

@@ -52,6 +52,7 @@
 import net.sf.jsqlparser.expression.OracleHint;
 import net.sf.jsqlparser.expression.OracleNamedFunctionParameter;
 import net.sf.jsqlparser.expression.OverlapsCondition;
+import net.sf.jsqlparser.expression.PostgresNamedFunctionParameter;
 import net.sf.jsqlparser.expression.RangeExpression;
 import net.sf.jsqlparser.expression.RowConstructor;
 import net.sf.jsqlparser.expression.RowGetExpression;
@@ -1835,4 +1836,13 @@ public <S> StringBuilder visit(FromQuery fromQuery, S context) {
     public <S> StringBuilder visit(DateUnitExpression dateUnitExpression, S context) {
         return builder.append(dateUnitExpression.toString());
     }
+
+    @Override
+    public <S> StringBuilder visit(PostgresNamedFunctionParameter postgresNamedFunctionParameter,
+            S context) {
+        builder.append(postgresNamedFunctionParameter.getName()).append(" := ");
+
+        postgresNamedFunctionParameter.getExpression().accept(this, context);
+        return builder;
+    }
 }