HHH-16020 - Fix for incorrect offset parameter index and add test for

issue

Signed-off-by: Jan Schatteman <jschatte@redhat.com>

HHH-16020 - Fix for error that surfaced in the LegacyOracleLimitHandler due to the fix for HHH-16020

Signed-off-by: Jan Schatteman <jschatte@redhat.com>

hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractLimitHandler.java

@@ -196,7 +196,7 @@ protected final int bindLimitParameters(Limit limit, PreparedStatement statement
 
 		if ( bindOffset ) {
 			statement.setInt(
-					index + ( reverse || !bindLimit ? 1 : 0 ),
+					index + ( reverse && bindLimit ? 1 : 0 ),
 					getFirstRow( limit )
 			);
 		}

hibernate-core/src/main/java/org/hibernate/dialect/pagination/LegacyOracleLimitHandler.java

@@ -61,6 +61,16 @@ public boolean supportsLimit() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsOffset() {
+		return true;
+	}
+
+	@Override
+	public boolean forceLimitUsage() {
+		return true;
+	}
+
 	@Override
 	public boolean bindLimitParametersInReverseOrder() {
 		return true;

hibernate-core/src/test/java/org/hibernate/orm/test/query/NativeQueryLimitOffsetTest.java

@@ -0,0 +1,132 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later
+ * See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
+ */
+package org.hibernate.orm.test.query;
+
+import java.util.List;
+
+import org.hibernate.dialect.AbstractHANADialect;
+import org.hibernate.dialect.MySQLDialect;
+import org.hibernate.dialect.OracleDialect;
+import org.hibernate.dialect.SpannerDialect;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.SkipForDialect;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+/**
+ * @author Jan Schatteman
+ */
+@DomainModel(
+		annotatedClasses = { NativeQueryLimitOffsetTest.Person.class }
+)
+@SessionFactory
+public class NativeQueryLimitOffsetTest {
+
+	@BeforeEach
+	public void setup(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					session.persist( new Person( 1L, "John" ) );
+					session.persist( new Person( 2L, "Jack" ) );
+					session.persist( new Person( 3L, "Bob" ) );
+					session.persist( new Person( 4L, "Jill" ) );
+					session.persist( new Person( 5L, "Jane" ) );
+					session.persist( new Person( 6L, "Anne" ) );
+					session.persist( new Person( 7L, "Joe" ) );
+				}
+		);
+	}
+
+	@AfterEach
+	public void tearDown(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					session.createMutationQuery( "delete from Person" ).executeUpdate();
+				}
+		);
+	}
+
+	@Test
+	@TestForIssue( jiraKey = "HHH-16020" )
+	public void testFullLimitOffsetOnNativeQuery(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					List<Long> l = session.createNativeQuery( "select id from Person where name like :name", Long.class)
+							.setParameter("name", "J%")
+							.setFirstResult( 1 )
+							.setMaxResults( 4 )
+							.getResultList();
+					assertEquals( 2, l.get( 0 ) );
+					assertEquals( 4, l.size() );
+				}
+		);
+	}
+
+	@Test
+	@TestForIssue( jiraKey = "HHH-16020" )
+	@SkipForDialect( dialectClass = MySQLDialect.class, matchSubTypes = true)
+	@SkipForDialect( dialectClass = OracleDialect.class, majorVersion = 12, minorVersion = 2, matchSubTypes = true)
+	@SkipForDialect( dialectClass = AbstractHANADialect.class, matchSubTypes = true)
+	@SkipForDialect( dialectClass = SpannerDialect.class, matchSubTypes = true)
+	public void testPartialLimitOffsetOnNativeQuery(SessionFactoryScope scope) {
+		scope.inTransaction(
+				session -> {
+					List<Long> l = session.createNativeQuery( "select id from Person where name like :name", Long.class)
+							.setParameter("name", "J%")
+							.setFirstResult(1)
+							.getResultList();
+					assertEquals( 2, l.get( 0 ) );
+					assertEquals( 4, l.size() );
+
+					l = session.createNativeQuery( "select id from Person where name like :name", Long.class)
+							.setParameter("name", "J%")
+							.setMaxResults( 3 )
+							.getResultList();
+					assertEquals( 1, l.get( 0 ) );
+					assertEquals( 3, l.size() );
+				}
+		);
+	}
+
+	@Entity(name = "Person")
+	public static class Person {
+		@Id
+		private Long id;
+		private String name;
+
+		public Person(Long id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+}