From 5b94dfad5ebc0ef9f929a7d9c7200ca577fea9b2 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 9 Mar 2024 10:05:03 -0500
Subject: [PATCH] use a fixed date that's not near DST switchover

CI has been failing here due to the DST switchover regarding
live dates.

Change-Id: I98b2dbe646180f41f948bec20193fdf3f63501b8
---
 lib/sqlalchemy/orm/util.py            |  2 +-
 test/dialect/postgresql/test_types.py | 30 +++++++++++++--------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index 1fd0f6863d..456d985d8e 100644
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -249,7 +249,7 @@ class CascadeOptions(FrozenSet[str]):
             values.clear()
         values.discard("all")
 
-        self = super().__new__(cls, values)  # type: ignore
+        self = super().__new__(cls, values)
         self.save_update = "save-update" in values
         self.delete = "delete" in values
         self.refresh_expire = "refresh-expire" in values
diff --git a/test/dialect/postgresql/test_types.py b/test/dialect/postgresql/test_types.py
index a5093c0bc9..08479b445f 100644
--- a/test/dialect/postgresql/test_types.py
+++ b/test/dialect/postgresql/test_types.py
@@ -5432,31 +5432,29 @@ class _DateTimeTZMultiRangeTests:
     _tstzs_delta = None
 
     def tstzs(self):
-        utc_now = cast(
-            func.current_timestamp().op("AT TIME ZONE")("utc"),
-            DateTime(timezone=True),
+        # note this was hitting DST issues when these tests were using a
+        # live date and running on or near 2024-03-09 :).   hardcoded to a
+        # date a few days earlier
+        utc_now = datetime.datetime(
+            2024, 3, 2, 14, 57, 50, 473566, tzinfo=datetime.timezone.utc
         )
 
         if self._tstzs is None:
-            with testing.db.connect() as connection:
-                lower = connection.scalar(select(utc_now))
-                upper = lower + datetime.timedelta(1)
-                self._tstzs = (lower, upper)
+            lower = utc_now
+            upper = lower + datetime.timedelta(1)
+            self._tstzs = (lower, upper)
         return self._tstzs
 
     def tstzs_delta(self):
-        utc_now = cast(
-            func.current_timestamp().op("AT TIME ZONE")("utc"),
-            DateTime(timezone=True),
+        utc_now = datetime.datetime(
+            2024, 3, 2, 14, 57, 50, 473566, tzinfo=datetime.timezone.utc
         )
 
         if self._tstzs_delta is None:
-            with testing.db.connect() as connection:
-                lower = connection.scalar(
-                    select(utc_now)
-                ) + datetime.timedelta(3)
-                upper = lower + datetime.timedelta(2)
-                self._tstzs_delta = (lower, upper)
+            lower = utc_now + datetime.timedelta(3)
+            upper = lower + datetime.timedelta(2)
+            self._tstzs_delta = (lower, upper)
+
         return self._tstzs_delta
 
     def _data_str(self):
-- 
2.47.2