From 5c58d9e2ba276eafd98c70abe7d1fbae99c06222 Mon Sep 17 00:00:00 2001
From: Tim Donohue <tim.donohue@lyrasis.org>
Date: Thu, 21 Mar 2024 11:26:21 -0500
Subject: [PATCH] In Hibernate 6, columnDefinition of "integer" should be
 @JdbcTypeCode(SqlTypes.INTEGER)

---
 .../src/main/java/org/dspace/content/BitstreamFormat.java    | 2 +-
 .../src/main/java/org/dspace/content/Relationship.java       | 5 ++++-
 .../src/main/java/org/dspace/content/RelationshipType.java   | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/content/BitstreamFormat.java b/dspace-api/src/main/java/org/dspace/content/BitstreamFormat.java
index 1937f615fb..4dacea0952 100644
--- a/dspace-api/src/main/java/org/dspace/content/BitstreamFormat.java
+++ b/dspace-api/src/main/java/org/dspace/content/BitstreamFormat.java
@@ -72,7 +72,7 @@ public class BitstreamFormat implements Serializable, ReloadableEntity<Integer>
     @ElementCollection(fetch = FetchType.EAGER)
     @CollectionTable(name = "fileextension", joinColumns = @JoinColumn(name = "bitstream_format_id"))
     @CollectionId(
-        column = @Column(name = "file_extension_id", columnDefinition = "integer"),
+        column = @Column(name = "file_extension_id"),
         generator = "fileextension_seq"
     )
     @CollectionIdJavaType(IntegerJavaType.class)
diff --git a/dspace-api/src/main/java/org/dspace/content/Relationship.java b/dspace-api/src/main/java/org/dspace/content/Relationship.java
index 5ec61b664e..05e4b00718 100644
--- a/dspace-api/src/main/java/org/dspace/content/Relationship.java
+++ b/dspace-api/src/main/java/org/dspace/content/Relationship.java
@@ -19,6 +19,8 @@ import jakarta.persistence.SequenceGenerator;
 import jakarta.persistence.Table;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  * This class represents a relationship
@@ -94,7 +96,8 @@ public class Relationship implements ReloadableEntity<Integer> {
      * or the item on that side is the most recent version that is relevant to the given relationship.
      * This column affects what version of an item appears on search pages or the relationship listings of other items.
      */
-    @Column(name = "latest_version_status", columnDefinition = "integer")
+    @Column(name = "latest_version_status")
+    @JdbcTypeCode(SqlTypes.INTEGER)
     private LatestVersionStatus latestVersionStatus = LatestVersionStatus.BOTH;
 
     /**
diff --git a/dspace-api/src/main/java/org/dspace/content/RelationshipType.java b/dspace-api/src/main/java/org/dspace/content/RelationshipType.java
index fd67cc2415..ba5f0531e9 100644
--- a/dspace-api/src/main/java/org/dspace/content/RelationshipType.java
+++ b/dspace-api/src/main/java/org/dspace/content/RelationshipType.java
@@ -20,6 +20,8 @@ import jakarta.persistence.SequenceGenerator;
 import jakarta.persistence.Table;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  * Class representing a RelationshipType
@@ -116,7 +118,8 @@ public class RelationshipType implements ReloadableEntity<Integer> {
     /**
      * The value indicating whether relationships of this type should be ignored on the right/left/neither.
      */
-    @Column(name = "tilted", columnDefinition = "integer")
+    @Column(name = "tilted")
+    @JdbcTypeCode(SqlTypes.INTEGER)
     private Tilted tilted;
 
     /**