HHH-14438 - ValueHandlers are broken

andreybpanfilov · andreybpanfilov · commit 3b82950b5791 · 2021-02-05T23:19:53.000+11:00
diff --git a/hibernate-core/src/main/java/org/hibernate/jpa/spi/CriteriaQueryTupleTransformer.java b/hibernate-core/src/main/java/org/hibernate/jpa/spi/CriteriaQueryTupleTransformer.java
@@ -46,7 +46,7 @@ public Object transformTuple(Object[] tuple, String[] aliases) {
 
 		return tupleElements == null
 				? valueHandlerResult.length == 1 ? valueHandlerResult[0] : valueHandlerResult
-				: new TupleImpl( tuple );
+				: new TupleImpl( valueHandlerResult );
 
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/expression/CompoundSelectionImpl.java b/hibernate-core/src/main/java/org/hibernate/query/criteria/internal/expression/CompoundSelectionImpl.java
@@ -63,7 +63,7 @@ public List<ValueHandlerFactory.ValueHandler> getValueHandlers() {
 			valueHandlers.add( valueHandler );
 			foundHandlers = foundHandlers || valueHandler != null;
 		}
-		return foundHandlers ? null : valueHandlers;
+		return foundHandlers ? valueHandlers : null;
 	}
 
 	public void registerParameters(ParameterRegistry registry) {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public Object transformTuple(Object[] tuple, String[] aliases) {`
`46`	`46`
`47`	`47`	`return tupleElements == null`
`48`	`48`	`? valueHandlerResult.length == 1 ? valueHandlerResult[0] : valueHandlerResult`
`49`		`- : new TupleImpl( tuple );`
	`49`	`+ : new TupleImpl( valueHandlerResult );`
`50`	`50`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public List<ValueHandlerFactory.ValueHandler> getValueHandlers() {`
`63`	`63`	`valueHandlers.add( valueHandler );`
`64`	`64`	`foundHandlers = foundHandlers \|\| valueHandler != null;`
`65`	`65`	`}`
`66`		`- return foundHandlers ? null : valueHandlers;`
	`66`	`+ return foundHandlers ? valueHandlers : null;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public void registerParameters(ParameterRegistry registry) {`