DATAJDBC-335 - Fix Select and Delete validators.

Author: mp911de

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/DeleteValidator.java

@@ -15,6 +15,8 @@
  */
 package org.springframework.data.relational.core.sql;
 
+import org.springframework.lang.Nullable;
+
 /**
  * Validator for {@link Delete} statements.
  * <p/>
@@ -25,6 +27,8 @@
  */
 class DeleteValidator extends AbstractImportValidator {
 
+	private @Nullable Select selectFilter;
+
 	public static void validate(Delete select) {
 		new DeleteValidator().doValidate(select);
 	}
@@ -40,4 +44,30 @@ private void doValidate(Delete select) {
 			}
 		}
 	}
+
+	@Override
+	public void enter(Visitable segment) {
+
+		if (selectFilter != null) {
+			return;
+		}
+
+		if (segment instanceof Select) {
+			this.selectFilter = (Select) segment;
+			return;
+		}
+
+		super.enter(segment);
+	}
+
+	@Override
+	public void leave(Visitable segment) {
+
+		if (this.selectFilter == segment) {
+			this.selectFilter = null;
+			return;
+		}
+
+		super.leave(segment);
+	}
 }

spring-data-relational/src/main/java/org/springframework/data/relational/core/sql/SelectValidator.java

@@ -17,6 +17,7 @@
 
 import java.util.HashSet;
 import java.util.Set;
+import java.util.Stack;
 
 /**
  * Validator for {@link Select} statements.
@@ -29,6 +30,8 @@
  */
 class SelectValidator extends AbstractImportValidator {
 
+	private final Stack<Select> selects = new Stack<>();
+
 	private int selectFieldCount;
 	private Set<Table> requiredBySelect = new HashSet<>();
 	private Set<Table> requiredByOrderBy = new HashSet<>();
@@ -76,6 +79,14 @@ private void doValidate(Select select) {
 	@Override
 	public void enter(Visitable segment) {
 
+		if (segment instanceof Select) {
+			selects.push((Select) segment);
+		}
+
+		if (selects.size() > 1) {
+			return;
+		}
+
 		super.enter(segment);
 
 		if (segment instanceof AsteriskFromTable && parent instanceof Select) {
@@ -118,4 +129,18 @@ public void enter(Visitable segment) {
 			});
 		}
 	}
+
+	@Override
+	public void leave(Visitable segment) {
+
+		if (segment instanceof Select) {
+			selects.remove(segment);
+		}
+
+		if (selects.size() > 1) {
+			return;
+		}
+
+		super.leave(segment);
+	}
 }

spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/DeleteValidatorUnitTests.java

@@ -20,7 +20,7 @@
 import org.junit.Test;
 
 /**
- * Unit tests for {@link SelectValidator}.
+ * Unit tests for {@link DeleteValidator}.
  *
  * @author Mark Paluch
  */
@@ -40,4 +40,21 @@ public void shouldReportMissingTableForDeleteViaWhere() {
 		}).isInstanceOf(IllegalStateException.class)
 				.hasMessageContaining("Required table [table] by a WHERE predicate not imported by FROM [bar]");
 	}
+
+	@Test // DATAJDBC-335
+	public void shouldIgnoreImportsFromSubselectsInWhereClause() {
+
+		Table foo = SQL.table("foo");
+		Column bar = foo.column("bar");
+
+		Table floo = SQL.table("floo");
+		Column bah = floo.column("bah");
+
+		Select subselect = Select.builder().select(bah).from(floo).build();
+
+		assertThatThrownBy(() -> {
+			Delete.builder().from(foo).where(Conditions.in(bar, subselect)).build();
+		}).isInstanceOf(IllegalStateException.class)
+				.hasMessageContaining("Required table [floo] by a WHERE predicate not imported by FROM [foo]");
+	}
 }

spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/SelectValidatorUnitTests.java

@@ -103,7 +103,7 @@ public void shouldIgnoreImportsFromSubselectsInWhereClause() {
 		assertThatThrownBy(() -> {
 			Select.builder().select(bah).from(foo).where(Conditions.in(bar, subselect)).build();
 		}).isInstanceOf(IllegalStateException.class)
-				.hasMessageContaining("Required table [bah] by a SELECT column not imported by FROM [foo] or JOIN []");
+				.hasMessageContaining("Required table [floo] by a SELECT column not imported by FROM [foo] or JOIN []");
 	}
 
 }