HSEARCH-4783 Make array indexing tests pass when using ORM 6.1+ and O…

…racle See https://hibernate.zulipchat.com/#narrow/stream/132094-hibernate-orm-dev/topic/JDBC.20type.20for.20arrays.20on.20Oracle
hibernate · Sep 25, 2023 · 6769af8 · 6769af8
1 parent c50c968
commit 6769af8
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 0 deletions.
diff --git a/...h/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingBooleanArrayIT.java b/...h/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingBooleanArrayIT.java
@@ -6,6 +6,7 @@
  */
 package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.array;
 
+import java.sql.Types;
 import java.util.Arrays;
 import java.util.List;
 
@@ -14,6 +15,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.OrderColumn;
 
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 import org.hibernate.search.util.impl.test.annotation.TestForIssue;
@@ -99,6 +101,7 @@ public static class IndexedEntity {
 		private Integer id;
 
 		@GenericField
+		@JdbcTypeCode(Types.VARBINARY)
 		private boolean[] serializedArray;
 
 		@GenericField

diff --git a/...ch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingDoubleArrayIT.java b/...ch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingDoubleArrayIT.java
@@ -6,6 +6,7 @@
  */
 package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.array;
 
+import java.sql.Types;
 import java.util.Arrays;
 import java.util.List;
 
@@ -14,6 +15,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.OrderColumn;
 
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 import org.hibernate.search.util.impl.test.annotation.TestForIssue;
@@ -99,6 +101,7 @@ public static class IndexedEntity {
 		private Integer id;
 
 		@GenericField
+		@JdbcTypeCode(Types.VARBINARY)
 		private double[] serializedArray;
 
 		@GenericField

diff --git a/...rch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingFloatArrayIT.java b/...rch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingFloatArrayIT.java
@@ -6,6 +6,7 @@
  */
 package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.array;
 
+import java.sql.Types;
 import java.util.Arrays;
 import java.util.List;
 
@@ -14,6 +15,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.OrderColumn;
 
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 import org.hibernate.search.util.impl.test.annotation.TestForIssue;
@@ -99,6 +101,7 @@ public static class IndexedEntity {
 		private Integer id;
 
 		@GenericField
+		@JdbcTypeCode(Types.VARBINARY)
 		private float[] serializedArray;
 
 		@GenericField

diff --git a/...earch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingIntArrayIT.java b/...earch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingIntArrayIT.java
@@ -6,6 +6,7 @@
  */
 package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.array;
 
+import java.sql.Types;
 import java.util.Arrays;
 import java.util.List;
 
@@ -14,6 +15,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.OrderColumn;
 
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 import org.hibernate.search.util.impl.test.annotation.TestForIssue;
@@ -99,6 +101,7 @@ public static class IndexedEntity {
 		private Integer id;
 
 		@GenericField
+		@JdbcTypeCode(Types.VARBINARY)
 		private int[] serializedArray;
 
 		@GenericField

diff --git a/...arch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingLongArrayIT.java b/...arch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingLongArrayIT.java
@@ -6,6 +6,7 @@
  */
 package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.array;
 
+import java.sql.Types;
 import java.util.Arrays;
 import java.util.List;
 
@@ -14,6 +15,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.OrderColumn;
 
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 import org.hibernate.search.util.impl.test.annotation.TestForIssue;
@@ -99,6 +101,7 @@ public static class IndexedEntity {
 		private Integer id;
 
 		@GenericField
+		@JdbcTypeCode(Types.VARBINARY)
 		private long[] serializedArray;
 
 		@GenericField

diff --git a/...rch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingShortArrayIT.java b/...rch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingShortArrayIT.java
@@ -6,6 +6,7 @@
  */
 package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.array;
 
+import java.sql.Types;
 import java.util.Arrays;
 import java.util.List;
 
@@ -14,6 +15,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.OrderColumn;
 
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 import org.hibernate.search.util.impl.test.annotation.TestForIssue;
@@ -99,6 +101,7 @@ public static class IndexedEntity {
 		private Integer id;
 
 		@GenericField
+		@JdbcTypeCode(Types.VARBINARY)
 		private short[] serializedArray;
 
 		@GenericField

diff --git a/...ch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingStringArrayIT.java b/...ch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingStringArrayIT.java
@@ -6,6 +6,7 @@
  */
 package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.array;
 
+import java.sql.Types;
 import java.util.Arrays;
 import java.util.List;
 
@@ -14,6 +15,7 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.OrderColumn;
 
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 
@@ -98,6 +100,7 @@ public static class IndexedEntity {
 		private Integer id;
 
 		@GenericField
+		@JdbcTypeCode(Types.VARBINARY)
 		private String[] serializedArray;
 
 		@GenericField

diff --git a/...rc/test/java/org/hibernate/search/integrationtest/mapper/orm/model/GenericPropertyIT.java b/...rc/test/java/org/hibernate/search/integrationtest/mapper/orm/model/GenericPropertyIT.java
@@ -9,6 +9,7 @@
 import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with;
 
 import java.io.Serializable;
+import java.sql.Types;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -19,6 +20,7 @@
 import jakarta.persistence.OneToMany;
 
 import org.hibernate.SessionFactory;
+import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded;
@@ -130,6 +132,7 @@ public abstract static class GenericEntity<T extends Serializable> {
 
 		@Basic
 		@GenericField
+		@JdbcTypeCode(Types.VARBINARY)
 		private T[] arrayContent;
 
 		@OneToMany(mappedBy = "genericProperty")