HHH-17246 Handle UUID specially within JSON

Author: beikov

hibernate-core/src/main/java/org/hibernate/dialect/OracleDialect.java

@@ -82,7 +82,6 @@
 import org.hibernate.type.JavaObjectType;
 import org.hibernate.type.NullType;
 import org.hibernate.type.StandardBasicTypes;
-import org.hibernate.type.descriptor.java.OracleUUIDJavaType;
 import org.hibernate.type.descriptor.java.PrimitiveByteArrayJavaType;
 import org.hibernate.type.descriptor.jdbc.BlobJdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
@@ -1042,8 +1041,6 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 				)
 		);
 
-		typeContributions.contributeJavaType( OracleUUIDJavaType.INSTANCE );
-
 		if(getVersion().isSameOrAfter(23)) {
 			final JdbcTypeRegistry jdbcTypeRegistry = typeContributions.getTypeConfiguration().getJdbcTypeRegistry();
 			jdbcTypeRegistry.addDescriptor(OracleEnumJdbcType.INSTANCE);

hibernate-core/src/main/java/org/hibernate/dialect/OracleUserDefinedTypeExporter.java

@@ -28,6 +28,7 @@
 import static org.hibernate.type.SqlTypes.TIMESTAMP_UTC;
 import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE;
 import static org.hibernate.type.SqlTypes.TINYINT;
+import static org.hibernate.type.SqlTypes.UUID;
 import static org.hibernate.type.SqlTypes.VARBINARY;
 
 /**
@@ -355,6 +356,8 @@ private String determineValueExpression(String expression, int elementSqlTypeCod
 			case VARBINARY:
 			case LONG32VARBINARY:
 				return "hextoraw(" + expression + ")";
+			case UUID:
+				return "hextoraw(replace(" + expression + ",'-',''))";
 			default:
 				return expression;
 		}

hibernate-core/src/main/java/org/hibernate/dialect/aggregate/OracleAggregateSupport.java

@@ -189,6 +189,11 @@ public String aggregateComponentCustomReadExpression(
 										placeholder,
 										"hextoraw(json_value(" + parentPartExpression + columnExpression + "'))"
 								);
+							case UUID:
+								return template.replace(
+										placeholder,
+										"hextoraw(replace(json_value(" + parentPartExpression + columnExpression + "'),'-',''))"
+								);
 							case CLOB:
 							case NCLOB:
 							case BLOB:
@@ -277,12 +282,16 @@ private String jsonCustomWriteExpression(
 				switch ( sqlTypeCode ) {
 					case CLOB:
 						return "to_clob(" + customWriteExpression + ")";
+					case UUID:
+						return "regexp_replace(lower(rawtohex(" + customWriteExpression + ")),'^(.{8})(.{4})(.{4})(.{4})(.{12})$','\\1-\\2-\\3-\\4-\\5')";
 					case ARRAY:
 						final BasicPluralType<?, ?> pluralType = (BasicPluralType<?, ?>) jdbcMapping;
 						final OracleArrayJdbcType jdbcType = (OracleArrayJdbcType) pluralType.getJdbcType();
 						switch ( jdbcType.getElementJdbcType().getDefaultSqlTypeCode() ) {
 							case CLOB:
 								return "(select json_arrayagg(to_clob(t.column_value)) from table(" + customWriteExpression + ") t)";
+							case UUID:
+								return "(select json_arrayagg(regexp_replace(lower(rawtohex(t.column_value)),'^(.{8})(.{4})(.{4})(.{4})(.{12})$','\\1-\\2-\\3-\\4-\\5')) from table(" + customWriteExpression + ") t)";
 							case BIT:
 								return "decode(" + customWriteExpression + ",1,'true',0,'false',null)";
 							case BOOLEAN:

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/OracleUUIDJavaType.java

@@ -6,13 +6,14 @@
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
-import org.hibernate.annotations.JdbcType;
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.dialect.SybaseASEDialect;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.orm.junit.RequiresDialect;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.type.SqlTypes;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -64,7 +65,7 @@ public void testTrailingZeroByteTruncation(SessionFactoryScope scope) {
 	static class Book {
 		@Id
 		// The purpose is to effectively provoke the trailing 0 bytes truncation
-		@JdbcType( SybaseUuidAsVarbinaryJdbcType.class )
+		@JdbcTypeCode( SqlTypes.VARBINARY )
 		UUID id;
 
 		String author;