Add Oracle integration tests.

Author: mp911de

pom.xml

@@ -38,6 +38,7 @@
 		<jsqlparser>5.0</jsqlparser>
 		<mysql-connector-java>9.1.0</mysql-connector-java>
 		<postgresql>42.7.4</postgresql>
+		<oracle>23.7.0.25.01</oracle>
 		<springdata.commons>4.0.0-SEARCH-RESULT-SNAPSHOT</springdata.commons>
 		<vavr>0.10.3</vavr>
 
@@ -120,6 +121,19 @@
 									</includes>
 								</configuration>
 							</execution>
+							<execution>
+								<id>oracle-test</id>
+								<phase>test</phase>
+								<goals>
+									<goal>test</goal>
+								</goals>
+								<configuration>
+									<includes>
+										<include>**/Oracle*IntegrationTests.java
+										</include>
+									</includes>
+								</configuration>
+							</execution>
 						</executions>
 					</plugin>
 				</plugins>

spring-data-jpa/pom.xml

@@ -167,6 +167,28 @@
 			<scope>test</scope>
 		</dependency>
 
+		<!-- Oracle testing support -->
+
+		<dependency>
+			<groupId>com.oracle.database.jdbc</groupId>
+			<artifactId>ojdbc17</artifactId>
+			<version>${oracle}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>com.oracle.database.jdbc</groupId>
+			<artifactId>ucp17</artifactId>
+			<version>${oracle}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>oracle-free</artifactId>
+			<scope>test</scope>
+		</dependency>
+
 		<dependency>
 			<groupId>io.vavr</groupId>
 			<artifactId>vavr</artifactId>
@@ -331,6 +353,7 @@
 								<exclude>**/EclipseLink*</exclude>
 								<exclude>**/MySql*</exclude>
 								<exclude>**/Postgres*</exclude>
+								<exclude>**/Oracle*</exclude>
 							</excludes>
 							<argLine>
 								-Xmx4G

spring-data-jpa/src/main/java/org/springframework/data/jpa/convert/VectorConverters.java

@@ -37,13 +37,12 @@
 
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Range;
 import org.springframework.data.domain.Score;
 import org.springframework.data.domain.ScoringFunction;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.VectorScoringFunctions;
-
-import org.springframework.data.domain.Sort;
 import org.springframework.data.jpa.domain.JpaSort;
 import org.springframework.data.jpa.repository.query.JpqlQueryBuilder.ParameterPlaceholder;
 import org.springframework.data.jpa.repository.query.ParameterBinding.PartTreeParameterBinding;
@@ -71,7 +70,8 @@
  * @author Christoph Strobl
  * @author Jinmyeong Kim
  */
-public class JpaQueryCreator extends AbstractQueryCreator<String, JpqlQueryBuilder.Predicate> implements JpqlQueryCreator {
+public class JpaQueryCreator extends AbstractQueryCreator<String, JpqlQueryBuilder.Predicate>
+		implements JpqlQueryCreator {
 
 	private static final Map<ScoringFunction, DistanceFunction> DISTANCE_FUNCTIONS = Map.of(VectorScoringFunctions.COSINE,
 			new DistanceFunction("cosine_distance", Sort.Direction.ASC), //
@@ -111,13 +111,12 @@ public JpaQueryCreator(PartTree tree, ReturnedType type, ParameterMetadataProvid
 	}
 
 	public JpaQueryCreator(PartTree tree, ReturnedType type, ParameterMetadataProvider provider,
-			JpqlQueryTemplates templates,
-			Metamodel metamodel) {
+			JpqlQueryTemplates templates, Metamodel metamodel) {
 		this(tree, false, type, provider, templates, metamodel);
 	}
 
 	public JpaQueryCreator(PartTree tree, boolean searchQuery, ReturnedType type, ParameterMetadataProvider provider,
-		JpqlQueryTemplates templates, Metamodel metamodel) {
+			JpqlQueryTemplates templates, Metamodel metamodel) {
 
 		super(tree);
 
@@ -488,11 +487,10 @@ public JpqlQueryBuilder.Predicate build() {
 					PartTreeParameterBinding parameter = provider.next(part, String.class);
 					JpqlQueryBuilder.Expression parameterExpression = potentiallyIgnoreCase(part.getProperty(),
 							placeholder(parameter));
+
 					// Predicate like = builder.like(propertyExpression, parameterExpression, escape.getEscapeCharacter());
 					String escapeChar = Character.toString(escape.getEscapeCharacter());
-					return
-
-					type.equals(NOT_LIKE) || type.equals(NOT_CONTAINING)
+					return type.equals(NOT_LIKE) || type.equals(NOT_CONTAINING)
 							? whereIgnoreCase.notLike(parameterExpression, escapeChar)
 							: whereIgnoreCase.like(parameterExpression, escapeChar);
 				case TRUE:
@@ -519,15 +517,14 @@ public JpqlQueryBuilder.Predicate build() {
 
 					where = JpqlQueryBuilder.where(entity, property);
 					return type.equals(IS_NOT_EMPTY) ? where.isNotEmpty() : where.isEmpty();
-
 				case WITHIN:
 				case NEAR:
 					PartTreeParameterBinding vector = provider.next(part);
 					PartTreeParameterBinding within = provider.next(part);
 
 					if (within.getValue() instanceof Range<?> r) {
 
-						Range<Score> range = (Range<Score>) within.getValue();
+						Range<Score> range = (Range<Score>) r;
 
 						if (range.getUpperBound().isBounded() || range.getUpperBound().isBounded()) {
 
@@ -573,6 +570,8 @@ public JpqlQueryBuilder.Predicate build() {
 						return getUpperPredicate(true, distance, distanceValue);
 					}
 
+					throw new InvalidDataAccessApiUsageException(
+							"Near/Within keywords must be used with a Score or Range<Score> type");
 				default:
 					throw new IllegalArgumentException("Unsupported keyword " + type);
 			}

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

@@ -78,8 +78,8 @@ public class ParameterMetadataProvider {
 	 * @param escape must not be {@literal null}.
 	 * @param templates must not be {@literal null}.
 	 */
-	public ParameterMetadataProvider(JpaParametersParameterAccessor accessor,
-			EscapeCharacter escape, JpqlQueryTemplates templates) {
+	public ParameterMetadataProvider(JpaParametersParameterAccessor accessor, EscapeCharacter escape,
+			JpqlQueryTemplates templates) {
 		this(accessor.iterator(), accessor, accessor.getParameters(), escape, templates);
 	}
 
@@ -91,8 +91,7 @@ public ParameterMetadataProvider(JpaParametersParameterAccessor accessor,
 	 * @param escape must not be {@literal null}.
 	 * @param templates must not be {@literal null}.
 	 */
-	public ParameterMetadataProvider(JpaParameters parameters, EscapeCharacter escape,
-			JpqlQueryTemplates templates) {
+	public ParameterMetadataProvider(JpaParameters parameters, EscapeCharacter escape, JpqlQueryTemplates templates) {
 		this(null, null, parameters, escape, templates);
 	}
 
@@ -106,8 +105,8 @@ public ParameterMetadataProvider(JpaParameters parameters, EscapeCharacter escap
 	 * @param templates must not be {@literal null}.
 	 */
 	private ParameterMetadataProvider(@Nullable Iterator<Object> bindableParameterValues,
-			@Nullable JpaParametersParameterAccessor accessor, JpaParameters parameters,
-			EscapeCharacter escape, JpqlQueryTemplates templates) {
+			@Nullable JpaParametersParameterAccessor accessor, JpaParameters parameters, EscapeCharacter escape,
+			JpqlQueryTemplates templates) {
 		Assert.notNull(parameters, "Parameters must not be null");
 		Assert.notNull(escape, "EscapeCharacter must not be null");
 		Assert.notNull(templates, "JpqlQueryTemplates must not be null");
@@ -196,14 +195,16 @@ private <T> PartTreeParameterBinding next(Part part, Class<T> type, Parameter pa
 		int currentPosition = ++position;
 		int currentBindMarker = ++bindMarker;
 
-		BindingIdentifier bindingIdentifier = parameter.getName().map(it -> BindingIdentifier.of(it, currentPosition))
+		BindingIdentifier bindingIdentifier = parameter.getName().map(it -> BindingIdentifier.of(it, currentBindMarker))
+				.orElseGet(() -> BindingIdentifier.of(currentBindMarker));
+
+		BindingIdentifier origin = parameter.getName().map(it -> BindingIdentifier.of(it, currentPosition))
 				.orElseGet(() -> BindingIdentifier.of(currentPosition));
 
 		/* identifier refers to bindable parameters, not _all_ parameters index */
-		MethodInvocationArgument methodParameter = ParameterOrigin.ofParameter(BindingIdentifier.of(currentPosition));
-		PartTreeParameterBinding binding = new PartTreeParameterBinding(BindingIdentifier.of(currentBindMarker),
-				methodParameter, reifiedType,
-				part, value, templates, escape);
+		MethodInvocationArgument methodParameter = ParameterOrigin.ofParameter(origin);
+		PartTreeParameterBinding binding = new PartTreeParameterBinding(bindingIdentifier,
+				methodParameter, reifiedType, part, value, templates, escape);
 
 		// PartTreeParameterBinding is more expressive than a potential ParameterBinding for Vector.
 		bindings.add(binding);
@@ -284,7 +285,7 @@ RangeParameterBinding lower(PartTreeParameterBinding within, SimilarityNormalize
 
 		BindingIdentifier identifier = within.getIdentifier();
 		RangeParameterBinding rangeBinding = new RangeParameterBinding(
-				identifier.mapName(name -> name + "_upper").withPosition(bindMarker), within.getOrigin(), true, normalizer);
+				identifier.mapName(name -> name + "_lower").withPosition(bindMarker), within.getOrigin(), true, normalizer);
 		bindings.add(rangeBinding);
 
 		return rangeBinding;