Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add support for arbitrary where clauses in Single Query Loading.

Browse Source 
Closes #1601
Original pull request: #1617
This commit is contained in:
Jens Schauder
2023-09-04 14:15:33 +02:00
committed by Mark Paluch
parent 6fb6110ca0
commit 0fdeaebbee
21 changed files with 313 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/QueryMapper.java
View File

@@ -373,12 +373,10 @@ public class QueryMapper {
mappedValue = convertValue(comparator, parameter.getValue(), propertyField.getTypeHint());
typeHint = getTypeHint(mappedValue, actualType.getType(), parameter);
} else if (criteria.getValue() instanceof ValueFunction) {
} else if (criteria.getValue() instanceof ValueFunction<?> valueFunction) {
ValueFunction<Object> valueFunction = (ValueFunction<Object>) criteria.getValue();
Object value = valueFunction.apply(getEscaper(comparator));
mappedValue = valueFunction.transform(v -> convertValue(comparator, v, propertyField.getTypeHint())).apply(getEscaper(comparator));
mappedValue = convertValue(comparator, value, propertyField.getTypeHint());
typeHint = actualType.getType();
} else {

10
spring-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/UpdateMapper.java
View File

@@ -111,18 +111,14 @@ public class UpdateMapper extends QueryMapper {
Object mappedValue;
Class<?> typeHint;
if (value instanceof Parameter) {
Parameter parameter = (Parameter) value;
if (value instanceof Parameter parameter) {
mappedValue = convertValue(parameter.getValue(), propertyField.getTypeHint());
typeHint = getTypeHint(mappedValue, actualType.getType(), parameter);
} else if (value instanceof ValueFunction) {
} else if (value instanceof ValueFunction<?> valueFunction) {
ValueFunction<Object> valueFunction = (ValueFunction<Object>) value;
mappedValue = convertValue(valueFunction.apply(Escaper.DEFAULT), propertyField.getTypeHint());
mappedValue = valueFunction.transform(v -> convertValue(v, propertyField.getTypeHint())).apply(Escaper.DEFAULT);
if (mappedValue == null) {
return Assignments.value(column, SQL.nullLiteral());