Fix Hibernate 6.6 JSON mapping on Oracle BLOB column type #742

vladmihalcea · Sep 30, 2024 · 1958252 · 1958252
1 parent 62196bc
commit 1958252
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/...main/java/io/hypersistence/utils/hibernate/type/json/internal/JsonJavaTypeDescriptor.java b/...main/java/io/hypersistence/utils/hibernate/type/json/internal/JsonJavaTypeDescriptor.java
@@ -6,6 +6,7 @@
 import org.hibernate.HibernateException;
 import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.annotations.common.reflection.java.JavaXMember;
+import org.hibernate.dialect.OracleDialect;
 import org.hibernate.engine.jdbc.BinaryStream;
 import org.hibernate.engine.jdbc.CharacterStream;
 import org.hibernate.engine.jdbc.internal.BinaryStreamImpl;
@@ -23,6 +24,7 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
+import java.nio.charset.StandardCharsets;
 import java.sql.Blob;
 import java.sql.Clob;
 import java.sql.SQLException;
@@ -152,8 +154,11 @@ public <X> X unwrap(Object value, Class<X> type, WrapperOptions options) {
         } else if (Blob.class.isAssignableFrom(type)) {
             String stringValue = (value instanceof String) ? (String) value : toString(value);
 
-            final Blob blob = BlobJavaType.INSTANCE.fromString(stringValue);
-            return (X) blob;
+            if(options.getDialect() instanceof OracleDialect) {
+                return (X) PrimitiveByteArrayJavaType.INSTANCE.unwrap(stringValue.getBytes(StandardCharsets.UTF_8), Blob.class, options);
+            } else {
+                return (X) BlobJavaType.INSTANCE.fromString(stringValue);
+            }
         } else  if (Clob.class.isAssignableFrom(type)) {
             String stringValue = (value instanceof String) ? (String) value : toString(value);