Fix CoercionException conversion to IllegalArgumentException for Quer…

…y parameter binding
hibernate · Oct 5, 2021 · b872d8a · b872d8a
1 parent 8df7a3a
commit b872d8a
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/QueryParameterBindingImpl.java
@@ -105,11 +105,23 @@ public void setBindValue(T value, boolean resolveJdbcTypeIfNecessary) {
 		}
 
 		if ( ! getTypeConfiguration().getSessionFactory().getJpaMetamodel().getJpaCompliance().isLoadByIdComplianceEnabled() ) {
-			if ( bindType != null ) {
-				value = bindType.getExpressableJavaTypeDescriptor().coerce( value, this );
+			try {
+				if ( bindType != null ) {
+					value = bindType.getExpressableJavaTypeDescriptor().coerce( value, this );
+				}
+				else if ( queryParameter.getHibernateType() != null ) {
+					value = queryParameter.getHibernateType().getExpressableJavaTypeDescriptor().coerce( value, this );
+				}
 			}
-			else if ( queryParameter.getHibernateType() != null ) {
-				value = queryParameter.getHibernateType().getExpressableJavaTypeDescriptor().coerce( value, this );
+			catch (CoercionException ce) {
+				throw new IllegalArgumentException(
+						String.format(
+								"Parameter value [%s] did not match expected type [%s ]",
+								value,
+								bindType.getTypeName()
+						),
+						ce
+				);
 			}
 		}