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

#363 - Count projection support for derived queries.

Browse Source 
Original pull request: #360.
This commit is contained in:
mhyeon-lee
2020-05-05 22:50:31 +09:00
committed by Jens Schauder
parent 919d8c663f
commit d004bc0dd9
2 changed files with 36 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/org/springframework/data/r2dbc/repository/query/R2dbcQueryCreator.java
View File

@@ -16,6 +16,7 @@
package org.springframework.data.r2dbc.repository.query;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -27,7 +28,7 @@ import org.springframework.data.r2dbc.core.StatementMapper;
import org.springframework.data.relational.core.mapping.RelationalPersistentEntity;
import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
import org.springframework.data.relational.core.query.Criteria;
import org.springframework.data.relational.core.sql.SqlIdentifier;
import org.springframework.data.relational.core.sql.*;
import org.springframework.data.relational.repository.query.RelationalEntityMetadata;
import org.springframework.data.relational.repository.query.RelationalParameterAccessor;
import org.springframework.data.relational.repository.query.RelationalQueryCreator;
@@ -41,6 +42,7 @@ import org.springframework.lang.Nullable;
* @author Roman Chigvintsev
* @author Mark Paluch
* @author Mingyuan Wu
* @author Myeonghyeon Lee
* @since 1.1
*/
class R2dbcQueryCreator extends RelationalQueryCreator<PreparedOperation<?>> {
@@ -132,28 +134,39 @@ class R2dbcQueryCreator extends RelationalQueryCreator<PreparedOperation<?>> {
return statementMapper.getMappedObject(selectSpec);
}
private SqlIdentifier[] getSelectProjection() {
private Expression[] getSelectProjection() {
List<SqlIdentifier> columnNames;
List<Expression> expressions;
Table table = Table.create(entityMetadata.getTableName());
if (!projectedProperties.isEmpty()) {
RelationalPersistentEntity<?> entity = entityMetadata.getTableEntity();
columnNames = new ArrayList<>(projectedProperties.size());
expressions = new ArrayList<>(projectedProperties.size());
for (String projectedProperty : projectedProperties) {
RelationalPersistentProperty property = entity.getPersistentProperty(projectedProperty);
columnNames.add(property != null ? property.getColumnName() : SqlIdentifier.unquoted(projectedProperty));
Column column = table.column(property != null ? property.getColumnName() : SqlIdentifier.unquoted(projectedProperty));
expressions.add(column);
}
} else if (tree.isExistsProjection()) {
columnNames = dataAccessStrategy.getIdentifierColumns(entityMetadata.getJavaType());
expressions = dataAccessStrategy.getIdentifierColumns(entityMetadata.getJavaType()).stream()
.map(table::column)
.collect(Collectors.toList());
} else if (tree.isCountProjection()) {
SqlIdentifier idColumn = entityMetadata.getTableEntity().getRequiredIdProperty().getColumnName();
expressions = Collections.singletonList(Functions.count(table.column(idColumn)));
} else {
columnNames = dataAccessStrategy.getAllColumns(entityMetadata.getJavaType());
expressions = dataAccessStrategy.getAllColumns(entityMetadata.getJavaType()).stream()
.map(table::column)
.collect(Collectors.toList());
}
return columnNames.toArray(new SqlIdentifier[0]);
return expressions.toArray(new Expression[0]);
}
private Sort getSort(Sort sort) {

15
src/test/java/org/springframework/data/r2dbc/repository/query/PartTreeR2dbcQueryUnitTests.java
View File

@@ -56,6 +56,7 @@ import org.springframework.data.repository.core.support.DefaultRepositoryMetadat
* @author Roman Chigvintsev
* @author Mark Paluch
* @author Mingyuan Wu
* @author Myeonghyeon Lee
*/
@RunWith(MockitoJUnitRunner.class)
public class PartTreeR2dbcQueryUnitTests {
@@ -618,6 +619,18 @@ public class PartTreeR2dbcQueryUnitTests {
+ ".foo FROM " + TABLE + " WHERE " + TABLE + ".first_name = $1");
}
@Test // DATAJDBC-534
public void createsQueryForCountProjection() throws Exception {
R2dbcQueryMethod queryMethod = getQueryMethod("countByFirstName", String.class);
PartTreeR2dbcQuery r2dbcQuery = new PartTreeR2dbcQuery(queryMethod, databaseClient, r2dbcConverter,
dataAccessStrategy);
BindableQuery query = r2dbcQuery.createQuery((getAccessor(queryMethod, new Object[] { "John" })));
assertThat(query.get())
.isEqualTo("SELECT COUNT(users.id) FROM " + TABLE + " WHERE " + TABLE + ".first_name = $1");
}
private R2dbcQueryMethod getQueryMethod(String methodName, Class<?>... parameterTypes) throws Exception {
Method method = UserRepository.class.getMethod(methodName, parameterTypes);
return new R2dbcQueryMethod(method, new DefaultRepositoryMetadata(UserRepository.class),
@@ -699,6 +712,8 @@ public class PartTreeR2dbcQueryUnitTests {
Mono<UserProjection> findDistinctByFirstName(String firstName);
Mono<Integer> deleteByFirstName(String firstName);
Mono<Long> countByFirstName(String firstName);
}
@Table("users")