HHH-19314 Fix fetch clause expression value retrieval

dreab8 · beikov · commit 5c26759c92a3 · 2025-04-17T09:48:37.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
@@ -6738,8 +6738,8 @@ private int getSortSelectionIndex(QuerySpec querySpec, SortSpecification sortSpe
 
 	private boolean isFetchFirstRowOnly(QueryPart queryPart) {
 		return queryPart.getFetchClauseType() == FetchClauseType.ROWS_ONLY
-				&& queryPart.getFetchClauseExpression() instanceof QueryLiteral<?> queryLiteral
-				&& Integer.valueOf( 1 ).equals( queryLiteral.getLiteralValue() );
+			&& queryPart.getFetchClauseExpression() != null
+			&& Integer.valueOf( 1 ).equals( getLiteralValue( queryPart.getFetchClauseExpression() ) );
 	}
 
 	private SelectStatement stripToSelectClause(SelectStatement statement) {

Original file line number	Diff line number	Diff line change
`@@ -6738,8 +6738,8 @@ private int getSortSelectionIndex(QuerySpec querySpec, SortSpecification sortSpe`
`6738`	`6738`
`6739`	`6739`	`private boolean isFetchFirstRowOnly(QueryPart queryPart) {`
`6740`	`6740`	`return queryPart.getFetchClauseType() == FetchClauseType.ROWS_ONLY`
`6741`		`- && queryPart.getFetchClauseExpression() instanceof QueryLiteral<?> queryLiteral`
`6742`		`- && Integer.valueOf( 1 ).equals( queryLiteral.getLiteralValue() );`
	`6741`	`+ && queryPart.getFetchClauseExpression() != null`
	`6742`	`+ && Integer.valueOf( 1 ).equals( getLiteralValue( queryPart.getFetchClauseExpression() ) );`
`6743`	`6743`	`}`
`6744`	`6744`
`6745`	`6745`	`private SelectStatement stripToSelectClause(SelectStatement statement) {`