From 735b1bc5409c9b360ca60d226f287a6aece56c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E9=87=91=E9=BE=99?= <36077516@qq.com>
Date: Mon, 1 Jun 2020 16:46:21 +0800
Subject: [PATCH] DATAJDBC-614 - Correctly combines sorting from sort and page.

Original pull request: #227.
---
 .../org/springframework/data/relational/core/query/Query.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
index 313dece0f..35a662e6b 100644
--- 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 class Query {
 
 		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());
 	}
 
 	/**