Reinstate parameter per entity for batch deletes using EclipseLink.

EclipseLink doesn't support WHERE e IN (:entities) and requires e = ?1 OR e = ?2 OR … style.

Closes #3983

Author: mp911de

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java

@@ -52,6 +52,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.jpa.domain.JpaSort.JpaOrder;
+import org.springframework.data.jpa.provider.PersistenceProvider;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.util.Streamable;
 import org.springframework.util.Assert;
@@ -516,6 +517,21 @@ private static Integer findClose(final Integer open, final List<Integer> closes,
 	 * @return Guaranteed to be not {@literal null}.
 	 */
 	public static <T> Query applyAndBind(String queryString, Iterable<T> entities, EntityManager entityManager) {
+		return applyAndBind(queryString, entities, entityManager, PersistenceProvider.fromEntityManager(entityManager));
+	}
+
+	/**
+	 * Creates a where-clause referencing the given entities and appends it to the given query string. Binds the given
+	 * entities to the query.
+	 *
+	 * @param <T> type of the entities.
+	 * @param queryString must not be {@literal null}.
+	 * @param entities must not be {@literal null}.
+	 * @param entityManager must not be {@literal null}.
+	 * @return Guaranteed to be not {@literal null}.
+	 */
+	static <T> Query applyAndBind(String queryString, Iterable<T> entities, EntityManager entityManager,
+			PersistenceProvider persistenceProvider) {
 
 		Assert.notNull(queryString, "Querystring must not be null");
 		Assert.notNull(entities, "Iterable of entities must not be null");
@@ -527,9 +543,46 @@ public static <T> Query applyAndBind(String queryString, Iterable<T> entities, E
 			return entityManager.createQuery(queryString);
 		}
 
+		if (persistenceProvider == PersistenceProvider.HIBERNATE) {
+
+			String alias = detectAlias(queryString);
+			Query query = entityManager.createQuery("%s where %s IN (?1)".formatted(queryString, alias));
+			query.setParameter(1, entities instanceof Collection<T> ? entities : Streamable.of(entities).toList());
+
+			return query;
+		}
+
+		return applyWhereEqualsAndBind(queryString, entities, entityManager, iterator);
+	}
+
+	private static Query applyWhereEqualsAndBind(String queryString, Iterable<?> entities, EntityManager entityManager,
+			Iterator<?> iterator) {
+
 		String alias = detectAlias(queryString);
-		Query query = entityManager.createQuery("%s where %s IN (?1)".formatted(queryString, alias));
-		query.setParameter(1, entities instanceof Collection<T> ? entities : Streamable.of(entities).toList());
+		StringBuilder builder = new StringBuilder(queryString);
+		builder.append(" where");
+
+		int i = 0;
+
+		while (iterator.hasNext()) {
+
+			iterator.next();
+
+			builder.append(String.format(" %s = ?%d", alias, ++i));
+
+			if (iterator.hasNext()) {
+				builder.append(" or");
+			}
+		}
+
+		Query query = entityManager.createQuery(builder.toString());
+
+		iterator = entities.iterator();
+		i = 0;
+
+		while (iterator.hasNext()) {
+			query.setParameter(++i, iterator.next());
+		}
 
 		return query;
 	}

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/UserRepositoryTests.java

@@ -3656,7 +3656,7 @@ private interface UserProjectionInterfaceBased {
 		String getLastname();
 	}
 
-	record UserDto(Integer id, String firstname, String lastname, String emailAddress) {
+	public record UserDto(Integer id, String firstname, String lastname, String emailAddress) {
 
 	}
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/EclipseLinkQueryUtilsIntegrationTests.java

@@ -22,12 +22,16 @@
 import jakarta.persistence.criteria.Path;
 import jakarta.persistence.criteria.Root;
 
+import java.util.List;
+
+import org.eclipse.persistence.internal.jpa.EJBQueryImpl;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.data.jpa.domain.sample.User;
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * EclipseLink variant of {@link QueryUtilsIntegrationTests}.
@@ -64,25 +68,43 @@ void prefersFetchOverJoin() {
 		assertThat(from.getJoins()).hasSize(1);
 	}
 
-
 	@Test // GH-3349
 	@Disabled
 	@Override
 	void doesNotCreateJoinForRelationshipSimpleId() {
-		//eclipse link produces join for path.get(relationship)
+		// eclipse link produces join for path.get(relationship)
 	}
 
 	@Test // GH-3349
 	@Disabled
 	@Override
 	void doesNotCreateJoinForRelationshipEmbeddedId() {
-		//eclipse link produces join for path.get(relationship)
+		// eclipse link produces join for path.get(relationship)
 	}
 
 	@Test // GH-3349
 	@Disabled
 	@Override
 	void doesNotCreateJoinForRelationshipIdClass() {
-		//eclipse link produces join for path.get(relationship)
+		// eclipse link produces join for path.get(relationship)
+	}
+
+	@Test // GH-3983, GH-2870
+	@Disabled("Not supported by EclipseLink")
+	@Transactional
+	@Override
+	void applyAndBindOptimizesIn() {}
+
+	@Test // GH-3983, GH-2870
+	@Transactional
+	@Override
+	void applyAndBindExpandsToPositionalPlaceholders() {
+
+		em.getCriteriaBuilder();
+		EJBQueryImpl<?> query = (EJBQueryImpl) QueryUtils.applyAndBind("DELETE FROM User u",
+				List.of(new User(), new User()), em.unwrap(null));
+
+		assertThat(query.getDatabaseQuery().getJPQLString()).isEqualTo("DELETE FROM User u where u = ?1 or u = ?2");
 	}
+
 }

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/QueryUtilsIntegrationTests.java

@@ -45,6 +45,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import org.hibernate.query.sqm.internal.SqmQueryImpl;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
@@ -62,6 +63,7 @@
 import org.springframework.data.mapping.PropertyPath;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * Integration tests for {@link QueryUtils}.
@@ -428,6 +430,29 @@ void doesNotCreateJoinForRelationshipIdClass() {
 		assertThat(from.getJoins()).isEmpty();
 	}
 
+	@Test // GH-3983, GH-2870
+	@Transactional
+	void applyAndBindOptimizesIn() {
+
+		em.getCriteriaBuilder();
+		SqmQueryImpl<?> query = (SqmQueryImpl) QueryUtils
+				.applyAndBind("DELETE FROM User u", List.of(new User(), new User()), em.unwrap(null));
+
+		assertThat(query.getQueryString()).isEqualTo("DELETE FROM User u where u IN (?1)");
+	}
+
+	@Test // GH-3983, GH-2870
+	@Transactional
+	void applyAndBindExpandsToPositionalPlaceholders() {
+
+		em.getCriteriaBuilder();
+		SqmQueryImpl<?> query = (SqmQueryImpl) QueryUtils
+				.applyAndBind("DELETE FROM User u", List.of(new User(), new User()), em.unwrap(null),
+						org.springframework.data.jpa.provider.PersistenceProvider.ECLIPSELINK);
+
+		assertThat(query.getQueryString()).isEqualTo("DELETE FROM User u where u = ?1 or u = ?2");
+	}
+
 	int getNumberOfJoinsAfterCreatingAPath() {
 		return 0;
 	}