Skip to content

DATAJDBC-584 - Allow sort by entity's child field #241

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

DATAJDBC-584 - Allow sort by entity's child field #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1703c80
DATAJDBC-584 - Allow sort by entity child field
myatmin Jul 26, 2020
2c1dd3c
Merge pull request #1 from spring-projects/master
myatmin Jul 30, 2020
60f41aa
Merge pull request #2 from spring-projects/master
myatmin Jul 30, 2020
f408369
DATAJDBC-587 Convert identity value object to SQL type with custom co…
myatmin Jul 30, 2020
edfaf39
Revert "DATAJDBC-587 Convert identity value object to SQL type with c…
myatmin Aug 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,8 +712,9 @@ private List<OrderByField> extractOrderByFields(Sort sort) {

private OrderByField orderToOrderByField(Sort.Order order) {

SqlIdentifier columnName = this.entity.getRequiredPersistentProperty(order.getProperty()).getColumnName();
Column column = Column.create(columnName, this.getTable());
PersistentPropertyPath<RelationalPersistentProperty> path = mappingContext.getPersistentPropertyPath(order.getProperty(), this.entity.getType());
PersistentPropertyPathExtension extPath = new PersistentPropertyPathExtension(mappingContext, path);
Column column = this.getColumn(extPath);
return OrderByField.from(column, order.getDirection());
}

Expand Down
7 changes: 4 additions & 3 deletions ...-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,11 @@ public void findAllSortedBySingleField() {
"ORDER BY x_name ASC");
}

@Test // DATAJDBC-101
@Test // DATAJDBC-101, DATAJDBC-584
Copy link
Contributor

@schauder schauder Oct 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer to have a separate test case for this. It makes it easier to understand what is going wrong in case of a test failure.

public void findAllSortedByMultipleFields() {

String sql = sqlGenerator.getFindAll(
Sort.by(new Sort.Order(Sort.Direction.DESC, "name"), new Sort.Order(Sort.Direction.ASC, "other")));
Sort.by(new Sort.Order(Sort.Direction.DESC, "name"), new Sort.Order(Sort.Direction.ASC, "ref.content"), new Sort.Order(Sort.Direction.DESC, "ref.further.something")));

assertThat(sql).contains("SELECT", //
"dummy_entity.id1 AS id1", //
Expand All @@ -238,7 +238,8 @@ public void findAllSortedByMultipleFields() {
"LEFT OUTER JOIN referenced_entity ref ON ref.dummy_entity = dummy_entity.id1", //
"LEFT OUTER JOIN second_level_referenced_entity ref_further ON ref_further.referenced_entity = ref.x_l1id", //
"ORDER BY x_name DESC", //
"x_other ASC");
"ref_x_content ASC", //
"ref_further_x_something DESC" );
}

@Test // DATAJDBC-101
Expand Down