HHH-15618 Accept TypedParameterValue for procedure

Author: quaff

hibernate-core/src/main/java/org/hibernate/procedure/internal/ParameterBindImpl.java

@@ -9,6 +9,7 @@
 import javax.persistence.ParameterMode;
 import javax.persistence.TemporalType;
 
+import org.hibernate.jpa.TypedParameterValue;
 import org.hibernate.procedure.ParameterBind;
 import org.hibernate.query.internal.BindingTypeHelper;
 import org.hibernate.query.procedure.internal.ProcedureParamBindings;
@@ -21,6 +22,7 @@
  * Implementation of the {@link ParameterBind} contract.
  *
  * @author Steve Ebersole
+ * @author Yanming Zhou
  */
 public class ParameterBindImpl<T> implements ParameterBind<T> {
 	private static final Logger log = Logger.getLogger( ParameterBindImpl.class );
@@ -61,6 +63,12 @@ public boolean isBound() {
 
 	@Override
 	public void setBindValue(T value) {
+		if ( value instanceof TypedParameterValue ) {
+			TypedParameterValue typedParameterValue = (TypedParameterValue) value;
+			this.hibernateType = typedParameterValue.getType();
+			value = (T) typedParameterValue.getValue();
+		}
+
 		internalSetValue( value );
 
 		if ( value != null && hibernateType == null ) {

hibernate-core/src/test/java/org/hibernate/test/procedure/StoredProcedureParameterTypeTest.java

@@ -29,6 +29,7 @@
 import javax.sql.rowset.serial.SerialBlob;
 import javax.sql.rowset.serial.SerialClob;
 
+import org.hibernate.jpa.TypedParameterValue;
 import org.hibernate.procedure.ProcedureCall;
 import org.hibernate.type.BigDecimalType;
 import org.hibernate.type.BigIntegerType;
@@ -71,6 +72,7 @@
 
 /**
  * @author Vlad Mihalcea
+ * @author Yanming Zhou
  */
 public class StoredProcedureParameterTypeTest extends BaseNonConfigCoreFunctionalTestCase {
 
@@ -422,4 +424,45 @@ public void testStringTypeInParameterIsNullWithoutEnablePassingNulls() {
 				}
 		);
 	}
+
+	@Test
+	@TestForIssue(jiraKey = "HHH-15618")
+	public void testTypedParameterValueInParameter() {
+		inTransaction(
+				session -> {
+					ProcedureCall procedureCall = session.createStoredProcedureCall( "test" );
+					procedureCall.registerParameter( 1, StringType.class, ParameterMode.IN );
+					procedureCall.setParameter( 1, new TypedParameterValue( StringType.INSTANCE, "test" ) );
+				}
+		);
+	}
+
+	@Test
+	@TestForIssue(jiraKey = "HHH-15618")
+	public void testTypedParameterValueInParameterWithEnablePassingNulls() {
+		inTransaction(
+				session -> {
+					ProcedureCall procedureCall = session.createStoredProcedureCall( "test" );
+					procedureCall.registerParameter( 1, StringType.class, ParameterMode.IN ).enablePassingNulls( true );
+					procedureCall.setParameter( 1, new TypedParameterValue( StringType.INSTANCE, null ) );
+				}
+		);
+	}
+
+	@Test
+	@TestForIssue(jiraKey = "HHH-15618")
+	public void testTypedParameterValueInParameterWithNotSpecifiedType() {
+		inTransaction(
+				session -> {
+					try {
+						ProcedureCall procedureCall = session.createStoredProcedureCall( "test" );
+						procedureCall.registerParameter( 1, StringType.class, ParameterMode.IN );
+						procedureCall.setParameter( 1, new TypedParameterValue( IntegerType.INSTANCE, 1 ) );
+					}
+					catch (IllegalArgumentException e) {
+						assertTrue( e.getMessage().contains( "was not of specified type" ) );
+					}
+				}
+		);
+	}
 }