diff --git a/src/main/java/net/sf/jsqlparser/util/validation/validator/AbstractValidator.java b/src/main/java/net/sf/jsqlparser/util/validation/validator/AbstractValidator.java index 495578376..4bb2dcf1b 100644 --- a/src/main/java/net/sf/jsqlparser/util/validation/validator/AbstractValidator.java +++ b/src/main/java/net/sf/jsqlparser/util/validation/validator/AbstractValidator.java @@ -14,6 +14,7 @@ import net.sf.jsqlparser.statement.update.UpdateSet; import net.sf.jsqlparser.statement.select.Select; import net.sf.jsqlparser.statement.select.SelectVisitor; +import net.sf.jsqlparser.statement.select.WithItem; import net.sf.jsqlparser.parser.feature.Feature; import net.sf.jsqlparser.statement.select.FromItem; import net.sf.jsqlparser.statement.select.OrderByElement; @@ -174,6 +175,11 @@ protected void validateOptionalExpressions(List expression (o, v) -> o.accept(v, null)); } + protected void validateOptionalWithItems(List> withItems) { + validateOptionalList(withItems, () -> getValidator(SelectValidator.class), + (w, v) -> w.accept((SelectVisitor) v, null)); + } + protected void validateOptionalFromItems(FromItem... fromItems) { validateOptionalFromItems(Arrays.asList(fromItems)); } diff --git a/src/main/java/net/sf/jsqlparser/util/validation/validator/DeleteValidator.java b/src/main/java/net/sf/jsqlparser/util/validation/validator/DeleteValidator.java index 85f41c7b8..176f65ce3 100644 --- a/src/main/java/net/sf/jsqlparser/util/validation/validator/DeleteValidator.java +++ b/src/main/java/net/sf/jsqlparser/util/validation/validator/DeleteValidator.java @@ -33,6 +33,8 @@ public void validate(Delete delete) { Feature.deleteReturningExpressionList); } + validateOptionalWithItems(delete.getWithItemsList()); + SelectValidator v = getValidator(SelectValidator.class); delete.getTable().accept(v, null); diff --git a/src/main/java/net/sf/jsqlparser/util/validation/validator/InsertValidator.java b/src/main/java/net/sf/jsqlparser/util/validation/validator/InsertValidator.java index 717e10bf0..943507e1a 100644 --- a/src/main/java/net/sf/jsqlparser/util/validation/validator/InsertValidator.java +++ b/src/main/java/net/sf/jsqlparser/util/validation/validator/InsertValidator.java @@ -13,6 +13,7 @@ import net.sf.jsqlparser.statement.insert.Insert; import net.sf.jsqlparser.statement.insert.OracleMultiInsertBranch; import net.sf.jsqlparser.statement.insert.OracleMultiInsertClause; +import net.sf.jsqlparser.statement.select.SelectVisitor; import net.sf.jsqlparser.statement.select.Values; import net.sf.jsqlparser.statement.update.UpdateSet; import net.sf.jsqlparser.util.validation.ValidationCapability; @@ -43,6 +44,8 @@ public void validate(Insert insert) { Feature.insertReturningExpressionList); } + validateOptionalWithItems(insert.getWithItemsList()); + if (insert.isOracleMultiInsert() && insert.getOracleMultiInsertBranches() != null) { ExpressionValidator v = getValidator(ExpressionValidator.class); for (OracleMultiInsertBranch branch : insert.getOracleMultiInsertBranches()) { @@ -70,6 +73,9 @@ public void validate(Insert insert) { if (insert.getSelect() instanceof Values) { insert.getSelect().accept(getValidator(StatementValidator.class), null); validateOptionalExpressions(insert.getValues().getExpressions()); + } else if (insert.getSelect() != null) { + insert.getSelect().accept( + (SelectVisitor) getValidator(SelectValidator.class), null); } if (insert.getSetUpdateSets() != null) { diff --git a/src/main/java/net/sf/jsqlparser/util/validation/validator/MergeValidator.java b/src/main/java/net/sf/jsqlparser/util/validation/validator/MergeValidator.java index d0664e987..d9ca48bdb 100644 --- a/src/main/java/net/sf/jsqlparser/util/validation/validator/MergeValidator.java +++ b/src/main/java/net/sf/jsqlparser/util/validation/validator/MergeValidator.java @@ -26,6 +26,7 @@ public void validate(Merge merge) { for (ValidationCapability c : getCapabilities()) { validateFeature(c, Feature.merge); } + validateOptionalWithItems(merge.getWithItemsList()); if (merge.getReturningClause() != null) { SelectValidator validator = getValidator(SelectValidator.class); merge.getReturningClause().forEach(item -> item.accept(validator, null)); diff --git a/src/main/java/net/sf/jsqlparser/util/validation/validator/UpdateValidator.java b/src/main/java/net/sf/jsqlparser/util/validation/validator/UpdateValidator.java index b7695b3d4..ae9ac519f 100644 --- a/src/main/java/net/sf/jsqlparser/util/validation/validator/UpdateValidator.java +++ b/src/main/java/net/sf/jsqlparser/util/validation/validator/UpdateValidator.java @@ -32,6 +32,8 @@ public void validate(Update update) { Feature.updateReturning); } + validateOptionalWithItems(update.getWithItemsList()); + if (!update.isTargetTableAlias()) { validateOptionalFromItem(update.getTable()); } diff --git a/src/test/java/net/sf/jsqlparser/util/validation/validator/DeleteValidatorTest.java b/src/test/java/net/sf/jsqlparser/util/validation/validator/DeleteValidatorTest.java index 6cd2f3375..17e642785 100644 --- a/src/test/java/net/sf/jsqlparser/util/validation/validator/DeleteValidatorTest.java +++ b/src/test/java/net/sf/jsqlparser/util/validation/validator/DeleteValidatorTest.java @@ -15,6 +15,7 @@ import net.sf.jsqlparser.util.validation.ValidationTestAsserts; import net.sf.jsqlparser.util.validation.feature.DatabaseType; import net.sf.jsqlparser.util.validation.feature.FeaturesAllowed; +import net.sf.jsqlparser.util.validation.feature.PostgresqlVersion; import org.junit.jupiter.api.Test; public class DeleteValidatorTest extends ValidationTestAsserts { @@ -47,4 +48,12 @@ public void testValidationDeleteLimitOrderBy() throws JSQLParserException { validateNoErrors(sql, 1, DatabaseType.MARIADB, DatabaseType.MYSQL); } + @Test + public void testValidateWithItemsOfDelete() { + String sql = "WITH d AS (UPDATE s SET a = 1 RETURNING a) DELETE FROM t"; + validateNotAllowed(sql, 1, 1, FeaturesAllowed.DELETE, Feature.withItem, Feature.update, + Feature.updateReturning); + validateNoErrors(sql, 1, PostgresqlVersion.V14); + } + } diff --git a/src/test/java/net/sf/jsqlparser/util/validation/validator/InsertValidatorTest.java b/src/test/java/net/sf/jsqlparser/util/validation/validator/InsertValidatorTest.java index 7fae82abc..77309b0e6 100644 --- a/src/test/java/net/sf/jsqlparser/util/validation/validator/InsertValidatorTest.java +++ b/src/test/java/net/sf/jsqlparser/util/validation/validator/InsertValidatorTest.java @@ -13,6 +13,7 @@ import net.sf.jsqlparser.util.validation.ValidationTestAsserts; import net.sf.jsqlparser.util.validation.feature.DatabaseType; import net.sf.jsqlparser.util.validation.feature.FeaturesAllowed; +import net.sf.jsqlparser.util.validation.feature.PostgresqlVersion; import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -71,4 +72,20 @@ public void testInsertMultiRowValue() { validateNoErrors(sql, 1, DatabaseType.SQLSERVER); } + @Test + public void testValidateSelectOfInsert() { + validateNotAllowed("INSERT INTO t SELECT pg_read_file('/etc/passwd')", 1, 1, + FeaturesAllowed.INSERT.copy().remove(Feature.function), Feature.function); + validateNotAllowed("INSERT INTO t SELECT a FROM s FOR UPDATE", 1, 1, + FeaturesAllowed.INSERT, Feature.selectForUpdate); + } + + @Test + public void testValidateWithItemsOfInsert() { + String sql = "WITH d AS (DELETE FROM s RETURNING a) INSERT INTO t SELECT a FROM d"; + validateNotAllowed(sql, 1, 1, FeaturesAllowed.INSERT, Feature.withItem, Feature.delete, + Feature.deleteReturningExpressionList); + validateNoErrors(sql, 1, PostgresqlVersion.V14); + } + } diff --git a/src/test/java/net/sf/jsqlparser/util/validation/validator/MergeValidatorTest.java b/src/test/java/net/sf/jsqlparser/util/validation/validator/MergeValidatorTest.java index ddf62f946..a2214373f 100644 --- a/src/test/java/net/sf/jsqlparser/util/validation/validator/MergeValidatorTest.java +++ b/src/test/java/net/sf/jsqlparser/util/validation/validator/MergeValidatorTest.java @@ -38,4 +38,12 @@ public void testValidateMergeNotAllowed() throws JSQLParserException { } } + @Test + public void testValidateWithItemsOfMerge() { + String sql = "WITH d AS (DELETE FROM s RETURNING a) " + + "MERGE INTO t USING d ON (t.a = d.a) WHEN MATCHED THEN UPDATE SET b = 1"; + validateNotAllowed(sql, 1, 1, FeaturesAllowed.MERGE, Feature.withItem, Feature.delete, + Feature.deleteReturningExpressionList); + } + } diff --git a/src/test/java/net/sf/jsqlparser/util/validation/validator/UpdateValidatorTest.java b/src/test/java/net/sf/jsqlparser/util/validation/validator/UpdateValidatorTest.java index ef8564376..716f7dcf4 100644 --- a/src/test/java/net/sf/jsqlparser/util/validation/validator/UpdateValidatorTest.java +++ b/src/test/java/net/sf/jsqlparser/util/validation/validator/UpdateValidatorTest.java @@ -14,6 +14,7 @@ import net.sf.jsqlparser.util.validation.ValidationTestAsserts; import net.sf.jsqlparser.util.validation.feature.DatabaseType; import net.sf.jsqlparser.util.validation.feature.FeaturesAllowed; +import net.sf.jsqlparser.util.validation.feature.PostgresqlVersion; import org.junit.jupiter.api.Test; public class UpdateValidatorTest extends ValidationTestAsserts { @@ -70,4 +71,12 @@ public void testUpdateWithOrderByAndLimit() throws JSQLParserException { validateNoErrors(sql, 1, DatabaseType.MYSQL, DatabaseType.MARIADB); } + @Test + public void testValidateWithItemsOfUpdate() { + String sql = "WITH d AS (DELETE FROM s RETURNING a) UPDATE t SET b = 1"; + validateNotAllowed(sql, 1, 1, FeaturesAllowed.UPDATE, Feature.withItem, Feature.delete, + Feature.deleteReturningExpressionList); + validateNoErrors(sql, 1, PostgresqlVersion.V14); + } + }