Skip to content

Commit

Permalink
HSEARCH-4783 Make array indexing tests pass when using ORM 6.1+ and O…
Browse files Browse the repository at this point in the history 
…racle

See https://hibernate.zulipchat.com/#narrow/stream/132094-hibernate-orm-dev/topic/JDBC.20type.20for.20arrays.20on.20Oracle
  • Loading branch information
@yrodiere
yrodiere committed Feb 1, 2023
1 parent 39c315b commit c1557f5
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 0 deletions.
3 changes: 3 additions & 0 deletions ...h/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingBooleanArrayIT.java
View file
Expand Up @@ -6,13 +6,15 @@
*/
package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.array;

import java.sql.Types;
import java.util.Arrays;
import java.util.List;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
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;
Expand Down Expand Up @@ -96,6 +98,7 @@ public static class IndexedEntity {
private Integer id;

@GenericField
@JdbcTypeCode(Types.VARBINARY)
private boolean[] serializedArray;

@GenericField
Expand Down
3 changes: 3 additions & 0 deletions ...ch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingDoubleArrayIT.java
View file
Expand Up @@ -6,13 +6,15 @@
*/
package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.array;

import java.sql.Types;
import java.util.Arrays;
import java.util.List;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
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;
Expand Down Expand Up @@ -96,6 +98,7 @@ public static class IndexedEntity {
private Integer id;

@GenericField
@JdbcTypeCode(Types.VARBINARY)
private double[] serializedArray;

@GenericField
Expand Down
3 changes: 3 additions & 0 deletions ...rch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingFloatArrayIT.java
View file
Expand Up @@ -6,13 +6,15 @@
*/
package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.array;

import java.sql.Types;
import java.util.Arrays;
import java.util.List;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
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;
Expand Down Expand Up @@ -96,6 +98,7 @@ public static class IndexedEntity {
private Integer id;

@GenericField
@JdbcTypeCode(Types.VARBINARY)
private float[] serializedArray;

@GenericField
Expand Down
3 changes: 3 additions & 0 deletions ...earch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingIntArrayIT.java
View file
Expand Up @@ -6,13 +6,15 @@
*/
package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.array;

import java.sql.Types;
import java.util.Arrays;
import java.util.List;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
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;
Expand Down Expand Up @@ -96,6 +98,7 @@ public static class IndexedEntity {
private Integer id;

@GenericField
@JdbcTypeCode(Types.VARBINARY)
private int[] serializedArray;

@GenericField
Expand Down
3 changes: 3 additions & 0 deletions ...arch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingLongArrayIT.java
View file
Expand Up @@ -6,13 +6,15 @@
*/
package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.array;

import java.sql.Types;
import java.util.Arrays;
import java.util.List;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
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;
Expand Down Expand Up @@ -96,6 +98,7 @@ public static class IndexedEntity {
private Integer id;

@GenericField
@JdbcTypeCode(Types.VARBINARY)
private long[] serializedArray;

@GenericField
Expand Down
3 changes: 3 additions & 0 deletions ...rch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingShortArrayIT.java
View file
Expand Up @@ -6,13 +6,15 @@
*/
package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.array;

import java.sql.Types;
import java.util.Arrays;
import java.util.List;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
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;
Expand Down Expand Up @@ -96,6 +98,7 @@ public static class IndexedEntity {
private Integer id;

@GenericField
@JdbcTypeCode(Types.VARBINARY)
private short[] serializedArray;

@GenericField
Expand Down
3 changes: 3 additions & 0 deletions ...ch/integrationtest/mapper/orm/automaticindexing/array/AutomaticIndexingStringArrayIT.java
View file
Expand Up @@ -6,13 +6,15 @@
*/
package org.hibernate.search.integrationtest.mapper.orm.automaticindexing.array;

import java.sql.Types;
import java.util.Arrays;
import java.util.List;
import jakarta.persistence.ElementCollection;
import jakarta.persistence.Entity;
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;

Expand Down Expand Up @@ -95,6 +97,7 @@ public static class IndexedEntity {
private Integer id;

@GenericField
@JdbcTypeCode(Types.VARBINARY)
private String[] serializedArray;

@GenericField
Expand Down
3 changes: 3 additions & 0 deletions ...rc/test/java/org/hibernate/search/integrationtest/mapper/orm/model/GenericPropertyIT.java
View file
Expand Up @@ -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;
import jakarta.persistence.Basic;
Expand All @@ -18,6 +19,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;
Expand Down Expand Up @@ -130,6 +132,7 @@ public abstract static class GenericEntity<T extends Serializable> {

@Basic
@GenericField
@JdbcTypeCode(Types.VARBINARY)
private T[] arrayContent;

@OneToMany(mappedBy = "genericProperty")
Expand Down

0 comments on commit c1557f5

Please sign in to comment.