DATAJDBC-614 - Correctly combines sorting from sort and page.

sjlzcj · schauder · commit 735b1bc5409c · 2020-10-13T15:18:44.000+02:00
Original pull request: #227.
diff --git a/spring-data-relational/src/main/java/org/springframework/data/relational/core/query/Query.java b/spring-data-relational/src/main/java/org/springframework/data/relational/core/query/Query.java
@@ -175,7 +175,8 @@ public Query with(Pageable pageable) {
 
 		assertNoCaseSort(pageable.getSort());
 
-		return new Query(this.criteria, this.columns, this.sort.and(sort), pageable.getPageSize(), pageable.getOffset());
+		return new Query(this.criteria, this.columns, this.sort.and(pageable.getSort()), pageable.getPageSize(),
+				pageable.getOffset());
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,8 @@ public Query with(Pageable pageable) {`
`175`	`175`
`176`	`176`	`assertNoCaseSort(pageable.getSort());`
`177`	`177`
`178`		`- return new Query(this.criteria, this.columns, this.sort.and(sort), pageable.getPageSize(), pageable.getOffset());`
	`178`	`+ return new Query(this.criteria, this.columns, this.sort.and(pageable.getSort()), pageable.getPageSize(),`
	`179`	`+ pageable.getOffset());`
`179`	`180`	`}`
`180`	`181`
`181`	`182`	`/**`