unbreak the imm_date type and friends

though perhaps we could just remove this functionality

Author: gavinking

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

@@ -6,6 +6,7 @@
 
 import java.io.Serializable;
 
+import jakarta.persistence.TemporalType;
 import org.hibernate.query.sqm.SqmBindableType;
 import org.hibernate.type.descriptor.converter.spi.BasicValueConverter;
 
@@ -24,30 +25,41 @@ public final class BasicTypeReference<T> implements BindableType<T>, Serializabl
 	private final int sqlTypeCode;
 	private final BasicValueConverter<T, ?> converter;
 	private final boolean forceImmutable;
+	private final TemporalType precision;
 
 	public BasicTypeReference(String name, Class<? extends T> javaType, int sqlTypeCode) {
-		this(name, javaType, sqlTypeCode, null);
+		this( name, javaType, sqlTypeCode, null, null, false );
 	}
 
 	public BasicTypeReference(
 			String name,
 			Class<? extends T> javaType,
 			int sqlTypeCode,
 			BasicValueConverter<T, ?> converter) {
-		this( name, javaType, sqlTypeCode, converter, false );
+		this( name, javaType, sqlTypeCode, null, converter, false );
+	}
+
+	public BasicTypeReference(
+			String name,
+			Class<? extends T> javaType,
+			int sqlTypeCode,
+			TemporalType precision) {
+		this( name, javaType, sqlTypeCode, precision, null, false );
 	}
 
 	private BasicTypeReference(
 			String name,
 			Class<? extends T> javaType,
 			int sqlTypeCode,
+			TemporalType precision,
 			BasicValueConverter<T, ?> converter,
 			boolean forceImmutable) {
 		this.name = name;
 		//noinspection unchecked
 		this.javaType = (Class<T>) javaType;
 		this.sqlTypeCode = sqlTypeCode;
 		this.converter = converter;
+		this.precision = precision;
 		this.forceImmutable = forceImmutable;
 	}
 
@@ -73,6 +85,10 @@ public int getSqlTypeCode() {
 		return converter;
 	}
 
+	public TemporalType getPrecision() {
+		return precision;
+	}
+
 	public boolean isForceImmutable() {
 		return forceImmutable;
 	}
@@ -82,6 +98,7 @@ public BasicTypeReference<T> asImmutable() {
 				"imm_" + name,
 				javaType,
 				sqlTypeCode,
+				precision,
 				converter,
 				true
 		);

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

@@ -18,6 +18,7 @@
 import org.hibernate.type.descriptor.java.BasicPluralJavaType;
 import org.hibernate.type.descriptor.java.ImmutableMutabilityPlan;
 import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.java.TemporalJavaType;
 import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry;
 import org.hibernate.type.descriptor.jdbc.ArrayJdbcType;
 import org.hibernate.type.descriptor.jdbc.DelegatingJdbcTypeIndicators;
@@ -89,7 +90,10 @@ else if ( !name.equals( typeReference.getName() ) ) {
 	}
 
 	private <T> BasicType<T> createBasicType(String name, BasicTypeReference<T> typeReference) {
-		final var javaType = getJavaTypeRegistry().resolveDescriptor( typeReference.getJavaType() );
+		var javaType = getJavaTypeRegistry().resolveDescriptor( typeReference.getJavaType() );
+		if ( javaType instanceof TemporalJavaType<?> temporalJavaType ) {
+			javaType = temporalJavaType.resolveTypeForPrecision( typeReference.getPrecision(), typeConfiguration  );
+		}
 		final var jdbcType = getJdbcTypeRegistry().getDescriptor( typeReference.getSqlTypeCode() );
 		final var createdType = createBasicType( typeReference, javaType, jdbcType );
 		typesByName.put( typeReference.getName(), createdType );
@@ -100,13 +104,13 @@ private <T> BasicType<T> createBasicType(String name, BasicTypeReference<T> type
 	private static <T> BasicType<T> createBasicType(
 			BasicTypeReference<T> typeReference, JavaType<T> javaType, JdbcType jdbcType) {
 		final String name = typeReference.getName();
-		if ( typeReference.getConverter() == null ) {
+		final var converter = typeReference.getConverter();
+		if ( converter == null ) {
 			return typeReference.isForceImmutable()
 					? new ImmutableNamedBasicTypeImpl<>( javaType, jdbcType, name )
 					: new NamedBasicTypeImpl<>( javaType, jdbcType, name );
 		}
 		else {
-			final var converter = typeReference.getConverter();
 			assert javaType == converter.getDomainJavaType();
 			return typeReference.isForceImmutable()
 					? new CustomMutabilityConvertedBasicTypeImpl<>( name, jdbcType, converter,

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

@@ -28,6 +28,7 @@
 import java.util.TimeZone;
 import java.util.UUID;
 
+import jakarta.persistence.TemporalType;
 import org.hibernate.type.spi.TypeConfiguration;
 
 /**
@@ -493,7 +494,8 @@ private StandardBasicTypes() {
 	public static final BasicTypeReference<Date> TIME = new BasicTypeReference<>(
 			"time",
 			java.util.Date.class,
-			SqlTypes.TIME
+			SqlTypes.TIME,
+			TemporalType.TIME
 	);
 
 	/**
@@ -503,7 +505,8 @@ private StandardBasicTypes() {
 	public static final BasicTypeReference<Date> DATE = new BasicTypeReference<>(
 			"date",
 			java.util.Date.class,
-			SqlTypes.DATE
+			SqlTypes.DATE,
+			TemporalType.DATE
 	);
 
 	/**
@@ -513,7 +516,8 @@ private StandardBasicTypes() {
 	public static final BasicTypeReference<Date> TIMESTAMP = new BasicTypeReference<>(
 			"timestamp",
 			java.util.Date.class,
-			SqlTypes.TIMESTAMP
+			SqlTypes.TIMESTAMP,
+			TemporalType.TIMESTAMP
 	);
 
 	/**
@@ -523,7 +527,8 @@ private StandardBasicTypes() {
 	public static final BasicTypeReference<java.sql.Time> SQL_TIME = new BasicTypeReference<>(
 			"sql_time",
 			java.sql.Time.class,
-			SqlTypes.TIME
+			SqlTypes.TIME,
+			TemporalType.TIME
 	);
 
 	/**
@@ -533,7 +538,8 @@ private StandardBasicTypes() {
 	public static final BasicTypeReference<java.sql.Date> SQL_DATE = new BasicTypeReference<>(
 			"sql_date",
 			java.sql.Date.class,
-			SqlTypes.DATE
+			SqlTypes.DATE,
+			TemporalType.DATE
 	);
 
 	/**
@@ -543,7 +549,8 @@ private StandardBasicTypes() {
 	public static final BasicTypeReference<java.sql.Timestamp> SQL_TIMESTAMP = new BasicTypeReference<>(
 			"sql_timestamp",
 			java.sql.Timestamp.class,
-			SqlTypes.TIMESTAMP
+			SqlTypes.TIMESTAMP,
+			TemporalType.TIMESTAMP
 	);
 
 	/**
@@ -553,7 +560,8 @@ private StandardBasicTypes() {
 	public static final BasicTypeReference<Calendar> CALENDAR = new BasicTypeReference<>(
 			"calendar",
 			Calendar.class,
-			SqlTypes.TIMESTAMP
+			SqlTypes.TIMESTAMP,
+			TemporalType.TIMESTAMP
 	);
 
 	/**
@@ -563,7 +571,8 @@ private StandardBasicTypes() {
 	public static final BasicTypeReference<Calendar> CALENDAR_DATE = new BasicTypeReference<>(
 			"calendar_date",
 			Calendar.class,
-			SqlTypes.DATE
+			SqlTypes.DATE,
+			TemporalType.DATE
 	);
 
 	/**
@@ -573,7 +582,8 @@ private StandardBasicTypes() {
 	public static final BasicTypeReference<Calendar> CALENDAR_TIME = new BasicTypeReference<>(
 			"calendar_time",
 			Calendar.class,
-			SqlTypes.TIME
+			SqlTypes.TIME,
+			TemporalType.TIME
 	);