HHH-18461 Fix native query doesn't respect query.setFirstResult(0)

quaff · quaff · commit 0899e497c553 · 2025-10-09T09:08:25.000+08:00
Align to JPQL query, generated sql should contain `offset ? rows` and pass `0` as parameter.
diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseDialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/AltibaseDialectTestCase.java
@@ -46,7 +46,7 @@ public void testSupportLimits() {
 	public void testSelectWithLimitOnly() {
 		assertEquals( "select c1, c2 from t1 order by c1, c2 desc limit ?",
 					withLimit("select c1, c2 from t1 order by c1, c2 desc",
-														toRowSelection( 0, 15 ) ).toLowerCase( Locale.ROOT));
+														toRowSelection( null, 15 ) ).toLowerCase( Locale.ROOT));
 	}
 
 	@Test
@@ -67,7 +67,7 @@ private String withLimit(String sql, Limit limit) {
 		return dialect.getLimitHandler().processSql( sql, -1, null, new LimitQueryOptions( limit ) );
 	}
 
-	private Limit toRowSelection(int firstRow, int maxRows) {
+	private Limit toRowSelection(Integer firstRow, Integer maxRows) {
 		Limit selection = new Limit();
 		selection.setFirstRow( firstRow );
 		selection.setMaxRows( maxRows );
diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyDialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyDialectTestCase.java
@@ -40,7 +40,7 @@ public void testInsertLimitClause(SessionFactoryScope scope) {
 		final String input = "select * from tablename t where t.cat = 5";
 		final String expected = "select * from tablename t where t.cat = 5 fetch first ? rows only";
 
-		final String actual = withLimit( input, toRowSelection( 0, limit ) );
+		final String actual = withLimit( input, toRowSelection( null, limit ) );
 		assertEquals( expected, actual );
 	}
 
@@ -103,7 +103,7 @@ private String withLimit(String sql, Limit limit) {
 		return new DerbyDialect().getLimitHandler().processSql( sql, -1, null, new LimitQueryOptions( limit ) );
 	}
 
-	private Limit toRowSelection(int firstRow, int maxRows) {
+	private Limit toRowSelection(Integer firstRow, Integer maxRows) {
 		Limit selection = new Limit();
 		selection.setFirstRow( firstRow );
 		selection.setMaxRows( maxRows );
diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLegacyDialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/DerbyLegacyDialectTestCase.java
@@ -28,7 +28,7 @@ public void testInsertLimitClause() {
 		final String input = "select * from tablename t where t.cat = 5";
 		final String expected = "select * from tablename t where t.cat = 5 fetch first " + limit + " rows only";
 
-		final String actual = withLimit( input, toRowSelection( 0, limit ) );
+		final String actual = withLimit( input, toRowSelection( null, limit ) );
 		assertEquals( expected, actual );
 	}
 
@@ -87,7 +87,7 @@ private String withLimit(String sql, Limit limit) {
 		return new DerbyLegacyDialect( DatabaseVersion.make( 10, 5 ) ).getLimitHandler().processSql( sql, -1, null, new LimitQueryOptions( limit ) );
 	}
 
-	private Limit toRowSelection(int firstRow, int maxRows) {
+	private Limit toRowSelection(Integer firstRow, Integer maxRows) {
 		Limit selection = new Limit();
 		selection.setFirstRow( firstRow );
 		selection.setMaxRows( maxRows );
diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/FirebirdDialectTest.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/FirebirdDialectTest.java
@@ -19,15 +19,15 @@ class FirebirdDialectTest {
 	@ParameterizedTest
 	@CsvSource(useHeadersInDisplayName = true, value = {
 			"major, minor, offset, limit, expectedSQL",
-			"2,     5,     0,      10,    select first ? * from tablename t where t.cat = 5",
+			"2,     5,     ,       10,    select first ? * from tablename t where t.cat = 5",
 			"2,     5,     10,     0,     select skip ? * from tablename t where t.cat = 5",
 			"2,     5,     5,      10,    select first ? skip ? * from tablename t where t.cat = 5",
-			"3,     0,     0,      10,    select * from tablename t where t.cat = 5 fetch first ? rows only",
+			"3,     0,     ,       10,    select * from tablename t where t.cat = 5 fetch first ? rows only",
 			"3,     0,     10,     0,     select * from tablename t where t.cat = 5 offset ? rows",
 			"3,     0,     5,      10,    select * from tablename t where t.cat = 5 offset ? rows fetch next ? rows only"
 	})
 	@JiraKey( "HHH-18213" )
-	void insertOffsetLimitClause(int major, int minor, int offset, int limit, String expectedSql) {
+	void insertOffsetLimitClause(int major, int minor, Integer offset, Integer limit, String expectedSql) {
 		String input = "select * from tablename t where t.cat = 5";
 		FirebirdDialect dialect = new FirebirdDialect( DatabaseVersion.make( major, minor ) );
 		String actual = dialect.getLimitHandler().processSql( input, -1, null, new LimitQueryOptions( new Limit( offset, limit ) ) );
diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2005DialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2005DialectTestCase.java
@@ -168,7 +168,7 @@ public void testGetLimitStringWithSelectDistinctSubselect() {
 				"select top(?) col0_.CONTENTID as CONTENT1_12_ " +
 						"where col0_.CONTENTTYPE='PAGE' and (col0_.CONTENTID in " +
 						"(select distinct col2_.PREVVER from CONTENT col2_ where (col2_.PREVVER is not null)))",
-				withLimit( selectDistinctSubselectSQL, toRowSelection( 0, 5 ) )
+				withLimit( selectDistinctSubselectSQL, toRowSelection( null, 5 ) )
 		);
 	}
 
@@ -254,7 +254,7 @@ public void testGetLimitStringWithMaxOnly() {
 		assertEquals(
 				"select top(?) product2x0_.id as id0_, product2x0_.description as descript2_0_ " +
 						"from Product2 product2x0_ order by product2x0_.id",
-				withLimit( query, toRowSelection( 0, 1 ) )
+				withLimit( query, toRowSelection( null, 1 ) )
 		);
 
 		final String distinctQuery = "select distinct product2x0_.id as id0_, product2x0_.description as descript2_0_ " +
@@ -263,7 +263,7 @@ public void testGetLimitStringWithMaxOnly() {
 		assertEquals(
 				"select distinct top(?) product2x0_.id as id0_, product2x0_.description as descript2_0_ " +
 						"from Product2 product2x0_ order by product2x0_.id",
-				withLimit( distinctQuery, toRowSelection( 0, 5 ) )
+				withLimit( distinctQuery, toRowSelection( null, 5 ) )
 		);
 	}
 
@@ -406,14 +406,14 @@ public void testGetLimitStringWithSelectClauseNestedQueryUsingParenthesisOnlyTop
 
 		assertEquals(
 				"select top(?) t1.c1 as col_0_0, (select case when count(t2.c1)>0 then 'ADDED' else 'UNMODIFIED' end from table2 t2 WHERE (t2.c1 in (?))) as col_1_0 from table1 t1 WHERE 1=1 ORDER BY t1.c1 ASC",
-				withLimit( query, toRowSelection( 0, 5 ) )
+				withLimit( query, toRowSelection( null, 5 ) )
 		);
 	}
 
 	@Test
 	@JiraKey(value = "HHH-8916")
 	public void testGetLimitStringUsingCTEQueryNoOffset() {
-		Limit selection = toRowSelection( 0, 5 );
+		Limit selection = toRowSelection( null, 5 );
 
 		// test top-based CTE with single CTE query_ definition with no odd formatting
 		final String query1 = "WITH a (c1, c2) AS (SELECT c1, c2 FROM t) SELECT c1, c2 FROM a";
@@ -639,7 +639,7 @@ private String withLimit(String sql, Limit limit) {
 		return dialect.getLimitHandler().processSql( sql, -1, null, new LimitQueryOptions( limit ) );
 	}
 
-	private Limit toRowSelection(int firstRow, int maxRows) {
+	private Limit toRowSelection(Integer firstRow, Integer maxRows) {
 		Limit selection = new Limit();
 		selection.setFirstRow( firstRow );
 		selection.setMaxRows( maxRows );
diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2008DialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2008DialectTestCase.java
@@ -169,7 +169,7 @@ public void testGetLimitStringWithSelectDistinctSubselect() {
 				"select top(?) col0_.CONTENTID as CONTENT1_12_ " +
 						"where col0_.CONTENTTYPE='PAGE' and (col0_.CONTENTID in " +
 						"(select distinct col2_.PREVVER from CONTENT col2_ where (col2_.PREVVER is not null)))",
-				withLimit( selectDistinctSubselectSQL, toRowSelection( 0, 5 ) )
+				withLimit( selectDistinctSubselectSQL, toRowSelection( null, 5 ) )
 		);
 	}
 
@@ -255,7 +255,7 @@ public void testGetLimitStringWithMaxOnly() {
 		assertEquals(
 				"select top(?) product2x0_.id as id0_, product2x0_.description as descript2_0_ " +
 						"from Product2 product2x0_ order by product2x0_.id",
-				withLimit( query, toRowSelection( 0, 1 ) )
+				withLimit( query, toRowSelection( null, 1 ) )
 		);
 
 		final String distinctQuery = "select distinct product2x0_.id as id0_, product2x0_.description as descript2_0_ " +
@@ -264,7 +264,7 @@ public void testGetLimitStringWithMaxOnly() {
 		assertEquals(
 				"select distinct top(?) product2x0_.id as id0_, product2x0_.description as descript2_0_ " +
 						"from Product2 product2x0_ order by product2x0_.id",
-				withLimit( distinctQuery, toRowSelection( 0, 5 ) )
+				withLimit( distinctQuery, toRowSelection( null, 5 ) )
 		);
 	}
 
@@ -407,14 +407,14 @@ public void testGetLimitStringWithSelectClauseNestedQueryUsingParenthesisOnlyTop
 
 		assertEquals(
 				"select top(?) t1.c1 as col_0_0, (select case when count(t2.c1)>0 then 'ADDED' else 'UNMODIFIED' end from table2 t2 WHERE (t2.c1 in (?))) as col_1_0 from table1 t1 WHERE 1=1 ORDER BY t1.c1 ASC",
-				withLimit( query, toRowSelection( 0, 5 ) )
+				withLimit( query, toRowSelection( null, 5 ) )
 		);
 	}
 
 	@Test
 	@JiraKey("HHH-8916")
 	public void testGetLimitStringUsingCTEQueryNoOffset() {
-		Limit selection = toRowSelection( 0, 5 );
+		Limit selection = toRowSelection( null, 5 );
 
 		// test top-based CTE with single CTE query_ definition with no odd formatting
 		final String query1 = "WITH a (c1, c2) AS (SELECT c1, c2 FROM t) SELECT c1, c2 FROM a";
@@ -640,7 +640,7 @@ private String withLimit(String sql, Limit limit) {
 		return dialect.getLimitHandler().processSql( sql, -1, null, new LimitQueryOptions( limit ) );
 	}
 
-	private Limit toRowSelection(int firstRow, int maxRows) {
+	private Limit toRowSelection(Integer firstRow, Integer maxRows) {
 		Limit selection = new Limit();
 		selection.setFirstRow( firstRow );
 		selection.setMaxRows( maxRows );
diff --git a/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2012DialectTestCase.java b/hibernate-community-dialects/src/test/java/org/hibernate/community/dialect/SQLServer2012DialectTestCase.java
@@ -44,7 +44,7 @@ public void testGetLimitStringMaxRowsOnly() {
 		final String input = "select distinct f1 as f53245 from table846752 order by f234, f67 desc";
 		assertEquals(
 				input + " offset 0 rows fetch first ? rows only",
-				withLimit( input, toRowSelection( 0, 10 ) ).toLowerCase( Locale.ROOT )
+				withLimit( input, toRowSelection( null, 10 ) ).toLowerCase( Locale.ROOT )
 		);
 	}
 
@@ -64,7 +64,7 @@ public void testGetLimitStringMaxRowsOnlyNoOrderBy() {
 		final String input = "select f1 from table";
 		assertEquals(
 				"select f1 from table order by @@version offset 0 rows fetch first ? rows only",
-				withLimit( input, toRowSelection( 0, 10 ) ).toLowerCase( Locale.ROOT )
+				withLimit( input, toRowSelection( null, 10 ) ).toLowerCase( Locale.ROOT )
 		);
 	}
 
@@ -82,7 +82,7 @@ private String withLimit(String sql, Limit limit) {
 		return dialect.getLimitHandler().processSql( sql, -1, null, new LimitQueryOptions( limit ) );
 	}
 
-	private Limit toRowSelection(int firstRow, int maxRows) {
+	private Limit toRowSelection(Integer firstRow, Integer maxRows) {
 		final Limit selection = new Limit();
 		selection.setFirstRow( firstRow );
 		selection.setMaxRows( maxRows );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractLimitHandler.java b/hibernate-core/src/main/java/org/hibernate/dialect/pagination/AbstractLimitHandler.java
@@ -233,8 +233,7 @@ public static boolean hasMaxRows(Limit limit) {
 	 */
 	public static boolean hasFirstRow(Limit limit) {
 		return limit != null
-				&& limit.getFirstRow() != null
-				&& limit.getFirstRow() > 0;
+				&& limit.getFirstRow() != null;
 	}
 
 	/**
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/AbstractLimitHandlerTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/dialect/AbstractLimitHandlerTest.java
@@ -48,7 +48,7 @@ protected void assertGenerateExpectedSql(String expected, String sql) {
 	protected abstract LimitHandler getLimitHandler();
 
 	protected Limit getLimit() {
-		return new Limit(0, 10);
+		return new Limit(null, 10);
 	}
 
 	protected String getLimitClause() {
@@ -62,9 +62,13 @@ protected String getLimitClause() {
 			}
 			else if (hasFirstRow(limit)) {
 				return " offset " + (oflh.supportsVariableLimit() ? "?" : String.valueOf(limit.getFirstRow())) + " rows";
-			} else {
+			}
+			else if (hasMaxRows(limit)) {
 				return " fetch first " + (oflh.supportsVariableLimit() ? "?" : String.valueOf(limit.getMaxRows())) + " rows only";
 			}
+			else {
+				return "";
+			}
 		}
 		return " limit ?";
 	}

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public void testInsertLimitClause(SessionFactoryScope scope) {`
`40`	`40`	`final String input = "select * from tablename t where t.cat = 5";`
`41`	`41`	`final String expected = "select * from tablename t where t.cat = 5 fetch first ? rows only";`
`42`	`42`
`43`		`- final String actual = withLimit( input, toRowSelection( 0, limit ) );`
	`43`	`+ final String actual = withLimit( input, toRowSelection( null, limit ) );`
`44`	`44`	`assertEquals( expected, actual );`
`45`	`45`	`}`
`46`	`46`
`@@ -103,7 +103,7 @@ private String withLimit(String sql, Limit limit) {`
`103`	`103`	`return new DerbyDialect().getLimitHandler().processSql( sql, -1, null, new LimitQueryOptions( limit ) );`
`104`	`104`	`}`
`105`	`105`
`106`		`- private Limit toRowSelection(int firstRow, int maxRows) {`
	`106`	`+ private Limit toRowSelection(Integer firstRow, Integer maxRows) {`
`107`	`107`	`Limit selection = new Limit();`
`108`	`108`	`selection.setFirstRow( firstRow );`
`109`	`109`	`selection.setMaxRows( maxRows );`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public void testInsertLimitClause() {`
`28`	`28`	`final String input = "select * from tablename t where t.cat = 5";`
`29`	`29`	`final String expected = "select * from tablename t where t.cat = 5 fetch first " + limit + " rows only";`
`30`	`30`
`31`		`- final String actual = withLimit( input, toRowSelection( 0, limit ) );`
	`31`	`+ final String actual = withLimit( input, toRowSelection( null, limit ) );`
`32`	`32`	`assertEquals( expected, actual );`
`33`	`33`	`}`
`34`	`34`
`@@ -87,7 +87,7 @@ private String withLimit(String sql, Limit limit) {`
`87`	`87`	`return new DerbyLegacyDialect( DatabaseVersion.make( 10, 5 ) ).getLimitHandler().processSql( sql, -1, null, new LimitQueryOptions( limit ) );`
`88`	`88`	`}`
`89`	`89`
`90`		`- private Limit toRowSelection(int firstRow, int maxRows) {`
	`90`	`+ private Limit toRowSelection(Integer firstRow, Integer maxRows) {`
`91`	`91`	`Limit selection = new Limit();`
`92`	`92`	`selection.setFirstRow( firstRow );`
`93`	`93`	`selection.setMaxRows( maxRows );`
Original file line number	Diff line number	Diff line change
`@@ -233,8 +233,7 @@ public static boolean hasMaxRows(Limit limit) {`
`233`	`233`	`*/`
`234`	`234`	`public static boolean hasFirstRow(Limit limit) {`
`235`	`235`	`return limit != null`
`236`		`- && limit.getFirstRow() != null`
`237`		`- && limit.getFirstRow() > 0;`
	`236`	`+ && limit.getFirstRow() != null;`
`238`	`237`	`}`
`239`	`238`
`240`	`239`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ protected void assertGenerateExpectedSql(String expected, String sql) {`
`48`	`48`	`protected abstract LimitHandler getLimitHandler();`
`49`	`49`
`50`	`50`	`protected Limit getLimit() {`
`51`		`- return new Limit(0, 10);`
	`51`	`+ return new Limit(null, 10);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`protected String getLimitClause() {`
`@@ -62,9 +62,13 @@ protected String getLimitClause() {`
`62`	`62`	`}`
`63`	`63`	`else if (hasFirstRow(limit)) {`
`64`	`64`	`return " offset " + (oflh.supportsVariableLimit() ? "?" : String.valueOf(limit.getFirstRow())) + " rows";`
`65`		`- } else {`
	`65`	`+ }`
	`66`	`+ else if (hasMaxRows(limit)) {`
`66`	`67`	`return " fetch first " + (oflh.supportsVariableLimit() ? "?" : String.valueOf(limit.getMaxRows())) + " rows only";`
`67`	`68`	`}`
	`69`	`+ else {`
	`70`	`+ return "";`
	`71`	`+ }`
`68`	`72`	`}`
`69`	`73`	`return " limit ?";`
`70`	`74`	`}`