diff --git a/src/main/java/net/sf/jsqlparser/statement/StatementFeatureVisitor.java b/src/main/java/net/sf/jsqlparser/statement/StatementFeatureVisitor.java index e7dfb0865..fc6e7dcca 100644 --- a/src/main/java/net/sf/jsqlparser/statement/StatementFeatureVisitor.java +++ b/src/main/java/net/sf/jsqlparser/statement/StatementFeatureVisitor.java @@ -638,6 +638,7 @@ public Void visit(PragmaStatement pragmaStatement, S context) { public Void visit(AssertStatement assertStatement, S context) { analysis.claimTopLevel(); analysis.certain(StmtFeature.READS_DATA); + assertStatement.getExpression().accept(analysis.expressions, context); return null; } @@ -1112,7 +1113,9 @@ private Void transactionOnly() { @Override public Void visit(SetStatement set, S context) { - return sessionOnly(); + sessionOnly(); + // the assigned values are evaluated, as in SET @x = f() + return super.visit(set, context); } @Override @@ -1147,7 +1150,14 @@ public Void visit(AlterSession alterSession, S context) { @Override public Void visit(DeclareStatement declareStatement, S context) { - return sessionOnly(); + sessionOnly(); + // the initial values are evaluated, as in DECLARE @x INT = f() + for (DeclareStatement.TypeDefExpr typeDefExpr : declareStatement.getTypeDefExprList()) { + if (typeDefExpr.getDefaultExpr() != null) { + typeDefExpr.getDefaultExpr().accept(analysis.expressions, context); + } + } + return null; } @Override diff --git a/src/test/java/net/sf/jsqlparser/statement/StatementFeatureVisitorTest.java b/src/test/java/net/sf/jsqlparser/statement/StatementFeatureVisitorTest.java index fe4ce53c4..86b736f5a 100644 --- a/src/test/java/net/sf/jsqlparser/statement/StatementFeatureVisitorTest.java +++ b/src/test/java/net/sf/jsqlparser/statement/StatementFeatureVisitorTest.java @@ -708,7 +708,12 @@ private StatementFeatures analyseAllPureExcept(String sql, String impure) "TABLE t ORDER BY pg_read_file('x')", "TABLE t LIMIT length(pg_read_file('x'))", "TABLE t OFFSET length(pg_read_file('x'))", - "TABLE t FETCH FIRST length(pg_read_file('x')) ROWS ONLY"}) + "TABLE t FETCH FIRST length(pg_read_file('x')) ROWS ONLY", + "SET @x = pg_read_file('x')", + "SET @a = 1, @b = pg_read_file('x')", + "SET x = pg_read_file('x')", + "DECLARE @x INT = length(pg_read_file('x'))", + "ASSERT length(pg_read_file('x')) > 0"}) void functionIsChecked(String sql) throws JSQLParserException { StatementFeatures impure = analyseAllPureExcept(sql, "pg_read_file"); assertThat(impure.getUnresolvedReferences()).containsExactly("pg_read_file"); @@ -765,6 +770,17 @@ void columnOutsideTheSequenceSyntaxIsNotChecked() throws JSQLParserException { assertThat(f.getUnresolvedReferences()).isEmpty(); } + @ParameterizedTest(name = "{0}") + @ValueSource(strings = { + "SET @x = (SELECT a FROM t)", + "DECLARE @x INT = (SELECT a FROM t)"}) + void assignedSubqueryIsRead(String sql) throws JSQLParserException { + StatementFeatures f = analyse(sql); + assertThat(f.is(StmtFeature.MODIFIES_SESSION)).isTrue(); + assertThat(f.is(StmtFeature.READS_DATA)).isTrue(); + assertThat(f.returnsResultSet()).isFalse(); + } + @Test void topLevelValuesReturnsRowsWithoutReading() throws JSQLParserException { StatementFeatures f = analyse("VALUES (1, 2)");