From 5af80551adb8d879a63a6616ff5021fb5f1d713a Mon Sep 17 00:00:00 2001
From: Gavin King <gavin@hibernate.org>
Date: Mon, 26 Feb 2024 14:28:31 +0100
Subject: [PATCH]  HHH-17779 support for key-based pagination

---
 .../sqm/internal/AbstractSqmSelectionQuery.java  | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java
index 4765de3d31..64c02a4a6e 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/AbstractSqmSelectionQuery.java
@@ -155,6 +155,7 @@ abstract class AbstractSqmSelectionQuery<R> extends AbstractSelectionQuery<R> {
 	private void addRestrictions(List<Order<? super R>> keyDefinition, List<Comparable<?>> keyValues) {
 		SqmSelectStatement<R> sqm = getSqmSelectStatement();
 		sqm = sqm.copy( noParamCopyContext() );
+		final NodeBuilder builder = sqm.nodeBuilder();
 		final SqmQuerySpec<R> querySpec = sqm.getQuerySpec();
 		final SqmWhereClause whereClause = querySpec.getWhereClause();
 		final List<? extends JpaSelection<?>> items = querySpec.getSelectClause().getSelectionItems();
@@ -166,7 +167,8 @@ abstract class AbstractSqmSelectionQuery<R> extends AbstractSelectionQuery<R> {
 					whereClause.applyPredicate( keyPredicate(
 							(SqmFrom<?,?>) selected,
 							keyDefinition.get(i),
-							(Comparable) keyValues.get(i))
+							(Comparable) keyValues.get(i),
+							builder)
 					);
 				}
 				else {
@@ -184,17 +186,21 @@ abstract class AbstractSqmSelectionQuery<R> extends AbstractSelectionQuery<R> {
 	}
 
 	private <C extends Comparable<? super C>> SqmPredicate keyPredicate(
-			SqmFrom<?, ?> selected, Order<? super R> key, C keyValue) {
+			SqmFrom<?, ?> selected, Order<? super R> key, C keyValue, NodeBuilder builder) {
 		if ( !key.getEntityClass().isAssignableFrom( selected.getJavaType() ) ) {
 			throw new IllegalQueryOperationException("Select item was of wrong entity type");
 		}
 		final Expression<? extends C> path = selected.get( key.getAttributeName() );
-		final NodeBuilder builder = getSqmStatement().nodeBuilder();
+		// TODO: use a parameter here and create a binding for it
+//		@SuppressWarnings("unchecked")
+//		final Class<C> valueClass = (Class<C>) keyValue.getClass();
+//		final JpaParameterExpression<C> parameter = builder.parameter(valueClass);
+//		setParameter( parameter, keyValue );
 		switch ( key.getDirection() ) {
 			case ASCENDING:
-				return builder.greaterThan( path, keyValue);
+				return builder.greaterThan( path, builder.literal(keyValue) );
 			case DESCENDING:
-				return builder.lessThan( path, keyValue);
+				return builder.lessThan( path, builder.literal(keyValue) );
 			default:
 				throw new AssertionFailure("Unrecognized key direction");
 		}