#373 - Use SpelQueryContext for expression query parsing.

We now use SpelQueryContext and SpelExtractor for analysis and rewrite of queries using SpEL.

Original pull request: #376.
This commit is contained in:
Mark Paluch
2020-05-27 13:30:20 +02:00
committed by Jens Schauder
parent 7e693019a4
commit 687142e134
2 changed files with 33 additions and 75 deletions

View File

@@ -28,6 +28,7 @@ import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.data.domain.Sort;
import org.springframework.data.geo.Point;
import org.springframework.data.projection.ProjectionFactory;
import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
import org.springframework.data.r2dbc.convert.MappingR2dbcConverter;
@@ -237,6 +238,23 @@ public class StringBasedR2dbcQueryUnitTests {
verifyNoMoreInteractions(bindSpec);
}
@Test // gh-373
public void bindsMultipleSpelParametersCorrectly() {
StringBasedR2dbcQuery query = getQueryMethod("queryWithTwoSpelExpressions", Point.class);
R2dbcParameterAccessor accessor = new R2dbcParameterAccessor(query.getQueryMethod(), new Point(1, 2));
BindableQuery stringQuery = query.createQuery(accessor);
assertThat(stringQuery.get())
.isEqualTo("INSERT IGNORE INTO table (x, y) VALUES (:__synthetic_0__, :__synthetic_1__)");
assertThat(stringQuery.bind(bindSpec)).isNotNull();
verify(bindSpec).bind("__synthetic_0__", 1d);
verify(bindSpec).bind("__synthetic_1__", 2d);
verifyNoMoreInteractions(bindSpec);
}
private StringBasedR2dbcQuery getQueryMethod(String name, Class<?>... args) {
Method method = ReflectionUtils.findMethod(SampleRepository.class, name, args);
@@ -282,6 +300,9 @@ public class StringBasedR2dbcQueryUnitTests {
@Query("SELECT * FROM person WHERE lastname = :name")
Person queryWithUnusedParameter(String name, Sort unused);
@Query("INSERT IGNORE INTO table (x, y) VALUES (:#{#point.x}, :#{#point.y})")
Person queryWithTwoSpelExpressions(@Param("point") Point point);
}
static class Person {