Merge branch 'master' of github.com:telerytech/piccolo

Author: dantownsend

piccolo/columns/defaults/timestamp.py

@@ -70,13 +70,15 @@ def __init__(
         month: int = 1,
         day: int = 1,
         hour: int = 0,
+        minute: int = 0,
         second: int = 0,
         microsecond: int = 0,
     ):
         self.year = year
         self.month = month
         self.day = day
         self.hour = hour
+        self.minute = minute
         self.second = second
         self.microsecond = microsecond
 
@@ -87,6 +89,7 @@ def datetime(self):
             month=self.month,
             day=self.day,
             hour=self.hour,
+            minute=self.minute,
             second=self.second,
             microsecond=self.microsecond,
         )
@@ -113,8 +116,9 @@ def from_datetime(cls, instance: datetime.datetime):  # type: ignore
         return cls(
             year=instance.year,
             month=instance.month,
-            day=instance.month,
+            day=instance.day,
             hour=instance.hour,
+            minute=instance.minute,
             second=instance.second,
             microsecond=instance.microsecond,
         )

piccolo/columns/defaults/timestamptz.py

@@ -47,6 +47,7 @@ def datetime(self):
             month=self.month,
             day=self.day,
             hour=self.hour,
+            minute=self.minute,
             second=self.second,
             microsecond=self.microsecond,
             tzinfo=datetime.timezone.utc,
@@ -59,8 +60,9 @@ def from_datetime(cls, instance: datetime.datetime):  # type: ignore
         return cls(
             year=instance.year,
             month=instance.month,
-            day=instance.month,
+            day=instance.day,
             hour=instance.hour,
+            minute=instance.minute,
             second=instance.second,
             microsecond=instance.microsecond,
         )

tests/columns/test_defaults.py

@@ -22,6 +22,8 @@
     TimestampNow,
     Varchar,
 )
+from piccolo.columns.defaults.timestamp import TimestampCustom
+from piccolo.columns.defaults.timestamptz import TimestamptzCustom
 from piccolo.table import Table
 
 
@@ -98,3 +100,35 @@ class MyTable(Table):
         ForeignKey(references=MyTable, default=1)
         with self.assertRaises(ValueError):
             ForeignKey(references=MyTable, default="hello world")
+
+
+class TestDatetime(TestCase):
+
+    def test_datetime(self):
+        """
+        Make sure we can create a `TimestampCustom` / `TimestamptzCustom` from
+        a datetime, and then convert it back into the same datetime again.
+
+        https://github.com/piccolo-orm/piccolo/issues/1169
+
+        """
+        datetime_obj = datetime.datetime(
+            year=2025,
+            month=1,
+            day=30,
+            hour=12,
+            minute=10,
+            second=15,
+            microsecond=100,
+        )
+
+        self.assertEqual(
+            TimestampCustom.from_datetime(datetime_obj).datetime,
+            datetime_obj,
+        )
+
+        datetime_obj = datetime_obj.astimezone(tz=datetime.timezone.utc)
+        self.assertEqual(
+            TimestamptzCustom.from_datetime(datetime_obj).datetime,
+            datetime_obj,
+        )