Skip to content

HHH-19713 Hibernate creates invalid SQLServer query when using pagination with Jakarta Data #10993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 25, 2025
Merged

HHH-19713 Hibernate creates invalid SQLServer query when using pagination with Jakarta Data #10993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions ...el-generator/src/main/java/org/hibernate/processor/annotation/AbstractCriteriaMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,14 +80,24 @@ String specificationType() {
}

@Override
void createQuery(StringBuilder declaration) {
void createQuery(StringBuilder declaration, boolean declareVariable) {
if ( declareVariable ) {
if ( dataRepository && !isReactive() ) {
declaration
.append('\t');
}
declaration
.append('\t');
declaration
.append("var _select = ");
}
final boolean specification = isUsingSpecification();
if ( specification && !isReactive() ) {
declaration
.append("_spec.createQuery(")
.append(localSessionName())
.append(getObjectCall())
.append(")\n");
.append(")");
}
else {
declaration
Expand All @@ -103,7 +113,7 @@ void createQuery(StringBuilder declaration) {
else {
declaration.append("_query");
}
declaration.append(")\n");
declaration.append( ")" );
}
}

Expand Down
31 changes: 19 additions & 12 deletions ...model-generator/src/main/java/org/hibernate/processor/annotation/AbstractQueryMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,10 +453,10 @@ void makeKeyedPage(StringBuilder declaration, List<String> paramTypes) {
"\t\t\t\t_results.isFirstPage() ? null : beforeCursor(_cursors.get(0), pageRequest.page()-1, pageRequest.size(), pageRequest.requestTotal()))";

static final String MAKE_KEYED_PAGE
= "\tvar _unkeyedPage =\n" +
= "\t\tvar _unkeyedPage =\n" +
"\t\t\tpage(pageRequest.size(), (int) pageRequest.page()-1)\n" +
"\t\t\t\t\t.keyedBy(_orders);\n" +
"\tvar _keyedPage =\n" +
"\t\tvar _keyedPage =\n" +
"\t\t\tpageRequest.cursor()\n" +
"\t\t\t\t\t.map(_cursor -> {\n" +
"\t\t\t\t\t\t@SuppressWarnings(\"unchecked\")\n" +
Expand All @@ -468,22 +468,25 @@ void makeKeyedPage(StringBuilder declaration, List<String> paramTypes) {
"\t\t\t\t\t\t};\n" +
"\t\t\t\t\t}).orElse(_unkeyedPage);";

void createQuery(StringBuilder declaration) {}
void createQuery(StringBuilder declaration, boolean declareVariable) {}

void createSpecification(StringBuilder declaration) {}

void setParameters(StringBuilder declaration, List<String> paramTypes, String indent) {}
void setParameters(StringBuilder declaration, List<String> paramTypes) {}

void tryReturn(StringBuilder declaration, List<String> paramTypes, @Nullable String containerType) {
if ( isJakartaCursoredPage(containerType) ) {
makeKeyedPage( declaration, paramTypes );
}
void inTry(StringBuilder declaration) {
if ( dataRepository && !isReactive() ) {
declaration
.append("\ttry {\n");
}
if ( JD_CURSORED_PAGE.equals(containerType)
|| JD_PAGE.equals(containerType) ) {
}

void results(StringBuilder declaration, List<String> paramTypes, @Nullable String containerType) {
if ( isJakartaCursoredPage(containerType) ) {
makeKeyedPage( declaration, paramTypes );
}
if ( isJakartaCursoredPage(containerType)
|| isJakartaPage(containerType) ) {
if ( dataRepository ) {
declaration
.append('\t');
Expand Down Expand Up @@ -522,6 +525,11 @@ void tryReturn(StringBuilder declaration, List<String> paramTypes, @Nullable Str
}
}

void select(StringBuilder declaration) {
declaration
.append("_select\n");
}

private void totalResults(StringBuilder declaration, List<String> paramTypes) {
declaration
.append("\tlong _totalResults = \n\t\t\t\t");
Expand All @@ -532,8 +540,7 @@ private void totalResults(StringBuilder declaration, List<String> paramTypes) {
declaration
.append(parameterName(JD_PAGE_REQUEST, paramTypes, paramNames))
.append(".requestTotal()\n\t\t\t\t\t\t? ");
createQuery( declaration );
setParameters( declaration, paramTypes, "\t\t\t\t\t");
select( declaration );
if ( isUsingEntityManager() ) {
declaration
.append("\t\t\t\t\t");
Expand Down
2 changes: 1 addition & 1 deletion ...odel-generator/src/main/java/org/hibernate/processor/annotation/CriteriaDeleteMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ void executeQuery(StringBuilder declaration, List<String> paramTypes) {
createSpecification( declaration );
handleRestrictionParameters( declaration, paramTypes );
tryReturn(declaration);
createQuery( declaration );
createQuery( declaration, false );
execute( declaration );
}

Expand Down
7 changes: 5 additions & 2 deletions ...odel-generator/src/main/java/org/hibernate/processor/annotation/CriteriaFinderMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,12 @@ void executeQuery(StringBuilder declaration, List<String> paramTypes) {
createSpecification( declaration );
handleRestrictionParameters( declaration, paramTypes );
collectOrdering( declaration, paramTypes, containerType );
tryReturn( declaration, paramTypes, containerType );
inTry( declaration );
createQuery( declaration, true );
declaration.append( ";\n" );
results( declaration, paramTypes, containerType );
castResult( declaration );
createQuery( declaration );
select( declaration );
handlePageParameters( declaration, paramTypes, containerType );
boolean unwrapped = initiallyUnwrapped();
unwrapped = enableFetchProfile( declaration, unwrapped );
Expand Down
36 changes: 23 additions & 13 deletions ...ing/metamodel-generator/src/main/java/org/hibernate/processor/annotation/QueryMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,13 @@ public String getAttributeDeclarationString() {
handleRestrictionParameters( declaration, paramTypes );
collectOrdering( declaration, paramTypes, containerType );
chainSession( declaration );
tryReturn( declaration, paramTypes, containerType );
inTry( declaration );
createQuery( declaration, true );
setParameters( declaration, paramTypes );
declaration.append( ";\n" );
results( declaration, paramTypes, containerType );
castResult( declaration );
createQuery( declaration );
setParameters( declaration, paramTypes, "");
select( declaration );
handlePageParameters( declaration, paramTypes, containerType );
execute( declaration, initiallyUnwrapped() );
convertExceptions( declaration );
Expand All @@ -116,7 +119,16 @@ String specificationType() {
}

@Override
void createQuery(StringBuilder declaration) {
void createQuery(StringBuilder declaration, boolean declareVariable) {
if ( declareVariable ) {
if ( dataRepository && !isReactive() ) {
declaration
.append('\t');
}
declaration
.append('\t');
declaration.append("var _select = ");
}
if ( isUsingSpecification() ) {
if ( isReactive() ) {
declaration
Expand All @@ -130,7 +142,7 @@ void createQuery(StringBuilder declaration) {
.append("_spec.createQuery(")
.append(localSessionName())
.append(getObjectCall())
.append(")\n");
.append(")");
}
}
else {
Expand All @@ -147,7 +159,7 @@ void createQuery(StringBuilder declaration) {
.append(annotationMetaEntity.importType(returnTypeClass))
.append(".class");
}
declaration.append(")\n");
declaration.append(")");
}
}

Expand Down Expand Up @@ -225,17 +237,15 @@ else if ( BOOLEAN.equals(returnTypeName) ) {
}

@Override
void setParameters(StringBuilder declaration, List<String> paramTypes, String indent) {
void setParameters(StringBuilder declaration, List<String> paramTypes) {
for ( int i = 0; i < paramNames.size(); i++ ) {
if ( !isSpecialParam( paramTypes.get(i) ) ) {
final String paramName = paramNames.get(i);
final int ordinal = i+1;
if ( queryString.contains(":" + paramName) ) {
declaration.append(indent);
setNamedParameter( declaration, paramName );
}
else if ( queryString.contains("?" + ordinal) ) {
declaration.append(indent);
setOrdinalParameter( declaration, ordinal, paramName );
}
}
Expand All @@ -244,20 +254,20 @@ else if ( queryString.contains("?" + ordinal) ) {

private static void setOrdinalParameter(StringBuilder declaration, int i, String paramName) {
declaration
.append("\t\t\t.setParameter(")
.append("\n\t\t\t.setParameter(")
.append(i)
.append(", ")
.append(paramName)
.append(")\n");
.append(")");
}

private static void setNamedParameter(StringBuilder declaration, String paramName) {
declaration
.append("\t\t\t.setParameter(\"")
.append("\n\t\t\t.setParameter(\"")
.append(paramName)
.append("\", ")
.append(paramName)
.append(")\n");
.append(")");
}

// private String returnType() {
Expand Down
Loading