From 962ccc827579ae2f3a64f5a04a37992486d2f303 Mon Sep 17 00:00:00 2001
From: TheChronicler <41308075+TheChronicler@users.noreply.github.com>
Date: Wed, 6 Nov 2024 11:53:39 +0100
Subject: [PATCH] Allow conversion from OffsetDateTime to java.sql.Timestamp

---
 .../eclipse/persistence/internal/helper/ConversionManager.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/helper/ConversionManager.java b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/helper/ConversionManager.java
index 409e9b56d4c..173f6a84428 100644
--- a/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/helper/ConversionManager.java
+++ b/foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/helper/ConversionManager.java
@@ -43,6 +43,7 @@
 import java.sql.Timestamp;
 import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.time.Year;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
@@ -838,6 +839,8 @@ protected java.sql.Timestamp convertObjectToTimestamp(Object sourceObject) throw
             timestamp = Helper.timestampFromLong((Long)sourceObject);
         } else if (sourceObject instanceof LocalDateTime) {
             timestamp = Timestamp.valueOf((LocalDateTime) sourceObject);
+        } else if (sourceObject instanceof OffsetDateTime) {
+            timestamp = Timestamp.valueOf(((OffsetDateTime)sourceObject).toLocalDateTime());
         } else {
             throw ConversionException.couldNotBeConverted(sourceObject, ClassConstants.TIMESTAMP);
         }