Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -174,6 +175,11 @@ protected void validateOptionalExpressions(List<? extends Expression> expression
(o, v) -> o.accept(v, null));
}

protected void validateOptionalWithItems(List<WithItem<?>> withItems) {
validateOptionalList(withItems, () -> getValidator(SelectValidator.class),
(w, v) -> w.accept((SelectVisitor<Void>) v, null));
}

protected void validateOptionalFromItems(FromItem... fromItems) {
validateOptionalFromItems(Arrays.asList(fromItems));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public void validate(Delete delete) {
Feature.deleteReturningExpressionList);
}

validateOptionalWithItems(delete.getWithItemsList());

SelectValidator v = getValidator(SelectValidator.class);
delete.getTable().accept(v, null);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()) {
Expand Down Expand Up @@ -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<Void>) getValidator(SelectValidator.class), null);
}

if (insert.getSetUpdateSets() != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ public void validate(Update update) {
Feature.updateReturning);
}

validateOptionalWithItems(update.getWithItemsList());

if (!update.isTargetTableAlias()) {
validateOptionalFromItem(update.getTable());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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);
}

}
Loading