HHH-19943 Use resolved type for SqmSelectableNode#getTupeLength

mbellade · mbellade · commit 95c7bc6674f6 · 2025-12-05T16:56:14.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/tree/select/SqmSelectableNode.java
@@ -35,7 +35,7 @@ public interface SqmSelectableNode<T> extends JpaSelection<T>, SqmTypedNode<T> {
 	SqmSelectableNode<T> copy(SqmCopyContext context);
 
 	default @Nullable Integer getTupleLength() {
-		final SqmBindableType<T> nodeType = getNodeType();
+		final SqmBindableType<T> nodeType = getExpressible();
 		final SqmDomainType<T> sqmType = nodeType == null ? null : nodeType.getSqmType();
 		return sqmType == null ? 1 : sqmType.getTupleLength();
 	}

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public interface SqmSelectableNode<T> extends JpaSelection<T>, SqmTypedNode<T> {`
`35`	`35`	`SqmSelectableNode<T> copy(SqmCopyContext context);`
`36`	`36`
`37`	`37`	`default @Nullable Integer getTupleLength() {`
`38`		`- final SqmBindableType<T> nodeType = getNodeType();`
	`38`	`+ final SqmBindableType<T> nodeType = getExpressible();`
`39`	`39`	`final SqmDomainType<T> sqmType = nodeType == null ? null : nodeType.getSqmType();`
`40`	`40`	`return sqmType == null ? 1 : sqmType.getTupleLength();`
`41`	`41`	`}`