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

DATAJDBC-530 - The sorting property set as the property name.

Browse Source 
Original pull request: #210.
This commit is contained in:
mhyeon-lee
2020-05-04 01:47:40 +09:00
committed by Jens Schauder
parent 8c70bbf7e0
commit f9bc40cc46
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlGenerator.java
View File

@@ -52,6 +52,7 @@ import org.springframework.util.Assert;
* @author Tom Hombergs
* @author Tyler Van Gorder
* @author Milan Milanov
* @author Myeonghyeon Lee
*/
class SqlGenerator {
@@ -659,7 +660,13 @@ class SqlGenerator {
private List<OrderByField> extractOrderByFields(Sort sort) {
return sort.stream()
.map(order -> OrderByField.from(Column.create(order.getProperty(), this.getTable()), order.getDirection()))
.map(order -> {
Column column = Column.create(
this.entity.getRequiredPersistentProperty(order.getProperty()).getColumnName(),
this.getTable()
);
return OrderByField.from(column, order.getDirection());
})
.collect(Collectors.toList());
}

7
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorUnitTests.java
View File

@@ -59,6 +59,7 @@ import org.springframework.data.relational.core.sql.Table;
* @author Mark Paluch
* @author Tom Hombergs
* @author Milan Milanov
* @author Myeonghyeon Lee
*/
public class SqlGeneratorUnitTests {
@@ -177,7 +178,7 @@ public class SqlGeneratorUnitTests {
@Test // DATAJDBC-101
public void findAllSortedBySingleField() {
String sql = sqlGenerator.getFindAll(Sort.by("x_name"));
String sql = sqlGenerator.getFindAll(Sort.by("name"));
assertThat(sql).contains("SELECT", //
"dummy_entity.id1 AS id1", //
@@ -197,7 +198,7 @@ public class SqlGeneratorUnitTests {
public void findAllSortedByMultipleFields() {
String sql = sqlGenerator.getFindAll(
Sort.by(new Sort.Order(Sort.Direction.DESC, "x_name"), new Sort.Order(Sort.Direction.ASC, "x_other")));
Sort.by(new Sort.Order(Sort.Direction.DESC, "name"), new Sort.Order(Sort.Direction.ASC, "other")));
assertThat(sql).contains("SELECT", //
"dummy_entity.id1 AS id1", //
@@ -245,7 +246,7 @@ public class SqlGeneratorUnitTests {
@Test // DATAJDBC-101
public void findAllPagedAndSorted() {
String sql = sqlGenerator.getFindAll(PageRequest.of(3, 10, Sort.by("x_name")));
String sql = sqlGenerator.getFindAll(PageRequest.of(3, 10, Sort.by("name")));
assertThat(sql).contains("SELECT", //
"dummy_entity.id1 AS id1", //