Merge pull request #755 from torotil/fix-754

fix(pendulum): Make PendulumDateTime work with postgres
kvesteri · Sep 6, 2024 · 19a0a10 · 19a0a10
2 parents a66ee64 + f3f33f7
commit 19a0a10
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/sqlalchemy_utils/types/enriched_datetime/pendulum_datetime.py b/sqlalchemy_utils/types/enriched_datetime/pendulum_datetime.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+import datetime
 
 from ...exceptions import ImproperlyConfigured
 
@@ -24,26 +24,20 @@ def _coerce(self, impl, value):
                 value = pendulum.from_timestamp(value)
             elif isinstance(value, str) and value.isdigit():
                 value = pendulum.from_timestamp(int(value))
-            elif isinstance(value, datetime):
-                value = pendulum.datetime(
-                    value.year,
-                    value.month,
-                    value.day,
-                    value.hour,
-                    value.minute,
-                    value.second,
-                    value.microsecond
-                )
+            elif isinstance(value, datetime.datetime):
+                value = pendulum.DateTime.instance(value)
             else:
                 value = pendulum.parse(value)
         return value
 
     def process_bind_param(self, impl, value, dialect):
         if value:
-            return self._coerce(impl, value).in_tz('UTC')
+            return self._coerce(impl, value).in_tz('UTC').naive()
         return value
 
     def process_result_value(self, impl, value, dialect):
         if value:
-            return pendulum.parse(value.isoformat())
+            return pendulum.DateTime.instance(
+                value.replace(tzinfo=datetime.timezone.utc)
+            )
         return value
diff --git a/tests/types/test_enriched_datetime_pendulum.py b/tests/types/test_enriched_datetime_pendulum.py
@@ -66,6 +66,15 @@ def test_utc(self, session, User):
         session.commit()
         assert user.created_at == time
 
+    @pytest.mark.usefixtures('postgresql_dsn')
+    def test_utc_postgres(self, session, User):
+        time = pendulum_datetime.pendulum.now("UTC")
+        user = User(created_at=time)
+        session.add(user)
+        assert user.created_at == time
+        session.commit()
+        assert user.created_at == time
+
     def test_other_tz(self, session, User):
         time = pendulum_datetime.pendulum.now("UTC")
         local = time.in_tz('Asia/Tokyo')