diff --git a/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitorAdapter.java b/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitorAdapter.java index 157582acb..b76a444e9 100644 --- a/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitorAdapter.java +++ b/src/main/java/net/sf/jsqlparser/statement/select/FromItemVisitorAdapter.java @@ -91,29 +91,39 @@ public T visit(MatchRecognize matchRecognize, S context) { matchRecognize.getInput().accept(this, context); matchRecognize .forEachExpression(expression -> expression.accept(expressionVisitor, context)); + visitPivots(matchRecognize, context); + return null; + } + + /** Walks the PIVOT / UNPIVOT clause the grammar may attach to any FROM item. */ + private void visitPivots(FromItem fromItem, S context) { PivotVisitorAdapter pivots = new PivotVisitorAdapter<>(expressionVisitor); - if (matchRecognize.getPivot() != null) { - matchRecognize.getPivot().accept(pivots, context); + if (fromItem.getPivot() != null) { + fromItem.getPivot().accept(pivots, context); } - if (matchRecognize.getUnPivot() != null) { - matchRecognize.getUnPivot().accept(pivots, context); + if (fromItem.getUnPivot() != null) { + fromItem.getUnPivot().accept(pivots, context); } - return null; } @Override public T visit(Table table, S context) { + visitPivots(table, context); return null; } @Override public T visit(ParenthesedSelect select, S context) { - return select.getSelect().accept(selectVisitor, context); + T result = select.getSelect().accept(selectVisitor, context); + visitPivots(select, context); + return result; } @Override public T visit(LateralSubSelect lateralSubSelect, S context) { - return lateralSubSelect.getSelect().accept(selectVisitor, context); + T result = lateralSubSelect.getSelect().accept(selectVisitor, context); + visitPivots(lateralSubSelect, context); + return result; } @Override @@ -123,6 +133,7 @@ public T visit(TableFunction tableFunction, S context) { function.accept(expressionVisitor, context); } } + visitPivots(tableFunction, context); return null; } @@ -130,6 +141,7 @@ public T visit(TableFunction tableFunction, S context) { public T visit(ParenthesedFromItem fromItem, S context) { T result = fromItem.getFromItem().accept(this, context); visitJoins(fromItem.getJoins(), context); + visitPivots(fromItem, context); return result; } @@ -138,6 +150,7 @@ public T visit(Values values, S context) { for (Expression expression : values.getExpressions()) { expression.accept(expressionVisitor, context); } + visitPivots(values, context); return null; } diff --git a/src/main/java/net/sf/jsqlparser/util/validation/validator/SelectValidator.java b/src/main/java/net/sf/jsqlparser/util/validation/validator/SelectValidator.java index 2223d28ca..1f91a415b 100644 --- a/src/main/java/net/sf/jsqlparser/util/validation/validator/SelectValidator.java +++ b/src/main/java/net/sf/jsqlparser/util/validation/validator/SelectValidator.java @@ -342,9 +342,17 @@ public Void visit(Table table, S context) { public Void visit(Pivot pivot, S context) { validateFeature(Feature.pivot); validateOptionalExpressions(pivot.getForColumns()); + validatePivotFunctions(pivot, context); return null; } + private void validatePivotFunctions(Pivot pivot, S context) { + if (isNotEmpty(pivot.getFunctionItems())) { + ExpressionValidator v = getValidator(ExpressionValidator.class); + pivot.getFunctionItems().forEach(f -> f.getExpression().accept(v, context)); + } + } + @Override public Void visit(UnPivot unpivot, S context) { validateFeature(Feature.unpivot); @@ -358,10 +366,7 @@ public Void visit(UnPivot unpivot, S context) { public Void visit(PivotXml pivot, S context) { validateFeature(Feature.pivotXml); validateOptionalExpressions(pivot.getForColumns()); - if (isNotEmpty(pivot.getFunctionItems())) { - ExpressionValidator v = getValidator(ExpressionValidator.class); - pivot.getFunctionItems().forEach(f -> f.getExpression().accept(v, context)); - } + validatePivotFunctions(pivot, context); if (pivot.getInSelect() != null) { pivot.getInSelect().accept((SelectVisitor) this, context); } diff --git a/src/test/java/net/sf/jsqlparser/statement/StatementFeatureVisitorTest.java b/src/test/java/net/sf/jsqlparser/statement/StatementFeatureVisitorTest.java index 67eb869ec..e4d466a72 100644 --- a/src/test/java/net/sf/jsqlparser/statement/StatementFeatureVisitorTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/StatementFeatureVisitorTest.java @@ -714,6 +714,10 @@ private StatementFeatures analyseAllPureExcept(String sql, String impure) "SET x = pg_read_file('x')", "DECLARE @x INT = length(pg_read_file('x'))", "ASSERT length(pg_read_file('x')) > 0", + "SELECT * FROM t PIVOT (sum(pg_read_file('x')) FOR a IN (1))", + "SELECT * FROM (SELECT a, b FROM t) PIVOT (sum(pg_read_file('x')) FOR a IN (1))", + "SELECT * FROM u JOIN t PIVOT (sum(pg_read_file('x')) FOR a IN (1)) ON 1 = 1", + "SELECT * FROM t PIVOT XML (sum(b) FOR a IN (SELECT pg_read_file('x') FROM u))"}) "SHOW TABLES WHERE length(pg_read_file('x')) > 0", "SHOW TABLE STATUS WHERE length(pg_read_file('x')) > 0", "SHOW COLUMNS FROM t WHERE length(pg_read_file('x')) > 0", diff --git a/src/test/java/net/sf/jsqlparser/util/validation/validator/SelectValidatorTest.java b/src/test/java/net/sf/jsqlparser/util/validation/validator/SelectValidatorTest.java index 5a7856166..99df2ae8a 100644 --- a/src/test/java/net/sf/jsqlparser/util/validation/validator/SelectValidatorTest.java +++ b/src/test/java/net/sf/jsqlparser/util/validation/validator/SelectValidatorTest.java @@ -267,7 +267,8 @@ public void testValidateTableFunctionArguments(String sql) { "SELECT a FROM t LIMIT 1 OFFSET upper(a)", "SELECT a FROM t OFFSET upper(a) ROWS", "SELECT a FROM t FETCH FIRST upper(a) ROWS ONLY", - "SELECT a FROM t UNION SELECT b FROM u LIMIT upper(a)"}) + "SELECT a FROM t UNION SELECT b FROM u LIMIT upper(a)", + "SELECT * FROM t PIVOT (max(upper(a)) FOR b IN (1))"}) public void testValidateFunctionOutsideWhere(String sql) { validateNotAllowed(sql, 1, 1, new FeaturesAllowed(Feature.values()).remove(Feature.function), Feature.function);