HHH-20125 Fix ComponentType#replace for polymorphic embeddables

Author: mbellade

hibernate-core/src/main/java/org/hibernate/type/ComponentType.java

@@ -117,7 +117,7 @@ public ComponentType(Component component, int[] originalPropertyOrder, boolean m
 		if ( discriminator != null ) {
 			this.discriminatorColumnSpan = discriminator.getColumnSpan();
 			this.propertyNames[i] = DISCRIMINATOR_ROLE_NAME;
-			this.propertyTypes[i] = discriminator.getType();
+			this.propertyTypes[i] = component.getDiscriminatorType();
 			this.propertyNullability[i] = false;
 			this.cascade[i] = CascadeStyles.NONE;
 			this.joinedFetch[i] = FetchMode.SELECT;
@@ -543,7 +543,7 @@ public Object replace(
 					copyCache
 			);
 
-			if ( target == null || !isMutable() ) {
+			if ( target == null || !isMutable() || embeddableTypeDescriptor().isPolymorphic() ) {
 				return instantiator( original ).instantiate( () -> replacedValues );
 			}
 			else {
@@ -577,7 +577,7 @@ public Object replace(
 					foreignKeyDirection
 			);
 
-			if ( target == null || !isMutable() ) {
+			if ( target == null || !isMutable() || embeddableTypeDescriptor().isPolymorphic() ) {
 				return instantiator( original ).instantiate( () -> replacedValues );
 			}
 			else {