piccolo 1.24.0__tar.gz → 1.24.2__tar.gz

{piccolo-1.24.0 → piccolo-1.24.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: piccolo
-Version: 1.24.0
+Version: 1.24.2
 Summary: A fast, user friendly ORM and query builder which supports asyncio.
 Home-page: https://github.com/piccolo-orm/piccolo
 Author: Daniel Townsend
@@ -54,6 +54,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: provides-extra
 Dynamic: requires-dist

piccolo-1.24.2/piccolo/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "1.24.2"

{piccolo-1.24.0 → piccolo-1.24.2}/piccolo/columns/combination.py

@@ -45,11 +45,11 @@ class Combination(CombinableMixin):
         )
 
     @property
-    def querystring_for_update(self) -> QueryString:
+    def querystring_for_update_and_delete(self) -> QueryString:
         return QueryString(
             "({} " + self.operator + " {})",
-            self.first.querystring_for_update,
-            self.second.querystring_for_update,
+            self.first.querystring_for_update_and_delete,
+            self.second.querystring_for_update_and_delete,
         )
 
     def __str__(self):
@@ -131,7 +131,7 @@ class WhereRaw(CombinableMixin):
         self.querystring = QueryString(sql, *args)
 
     @property
-    def querystring_for_update(self) -> QueryString:
+    def querystring_for_update_and_delete(self) -> QueryString:
         return self.querystring
 
     def __str__(self):
@@ -218,7 +218,7 @@ class Where(CombinableMixin):
         return QueryString(template, *args)
 
     @property
-    def querystring_for_update(self) -> QueryString:
+    def querystring_for_update_and_delete(self) -> QueryString:
         args: t.List[t.Any] = []
         if self.value != UNDEFINED:
             args.append(self.value)

{piccolo-1.24.0 → piccolo-1.24.2}/piccolo/columns/defaults/timestamp.py

@@ -70,6 +70,7 @@ class TimestampCustom(Default):
         month: int = 1,
         day: int = 1,
         hour: int = 0,
+        minute: int = 0,
         second: int = 0,
         microsecond: int = 0,
     ):
@@ -77,6 +78,7 @@ class TimestampCustom(Default):
         self.month = month
         self.day = day
         self.hour = hour
+        self.minute = minute
         self.second = second
         self.microsecond = microsecond
 
@@ -87,6 +89,7 @@ class TimestampCustom(Default):
             month=self.month,
             day=self.day,
             hour=self.hour,
+            minute=self.minute,
             second=self.second,
             microsecond=self.microsecond,
         )
@@ -113,8 +116,9 @@ class TimestampCustom(Default):
         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-1.24.0 → piccolo-1.24.2}/piccolo/columns/defaults/timestamptz.py

@@ -47,6 +47,7 @@ class TimestamptzCustom(TimestampCustom):
             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 @@ class TimestamptzCustom(TimestampCustom):
         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-1.24.0 → piccolo-1.24.2}/piccolo/query/methods/delete.py

@@ -61,7 +61,7 @@ class Delete(Query):
             querystring = QueryString(
                 "{} WHERE {}",
                 querystring,
-                self.where_delegate._where.querystring,
+                self.where_delegate._where.querystring_for_update_and_delete,
             )
 
         if self.returning_delegate._returning:

{piccolo-1.24.0 → piccolo-1.24.2}/piccolo/query/methods/update.py

@@ -104,7 +104,7 @@ class Update(Query[TableInstance, t.List[t.Any]]):
             querystring = QueryString(
                 "{} WHERE {}",
                 querystring,
-                self.where_delegate._where.querystring_for_update,
+                self.where_delegate._where.querystring_for_update_and_delete,
             )
 
         if self.returning_delegate._returning:

{piccolo-1.24.0 → piccolo-1.24.2}/piccolo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: piccolo
-Version: 1.24.0
+Version: 1.24.2
 Summary: A fast, user friendly ORM and query builder which supports asyncio.
 Home-page: https://github.com/piccolo-orm/piccolo
 Author: Daniel Townsend
@@ -54,6 +54,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: license
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: provides-extra
 Dynamic: requires-dist

{piccolo-1.24.0 → piccolo-1.24.2}/tests/columns/test_defaults.py

@@ -22,6 +22,8 @@ from piccolo.columns.column_types import (
     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 TestDefaults(TestCase):
         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,
+        )

{piccolo-1.24.0 → piccolo-1.24.2}/tests/table/test_delete.py

@@ -44,3 +44,18 @@ class TestDelete(DBTestCase):
             Band.delete().run_sync()
 
         Band.delete(force=True).run_sync()
+
+    def test_delete_with_joins(self):
+        """
+        Make sure delete works if the `where` clause specifies joins.
+        """
+
+        self.insert_rows()
+
+        Band.delete().where(Band.manager._.name == "Guido").run_sync()
+
+        response = (
+            Band.count().where(Band.manager._.name == "Guido").run_sync()
+        )
+
+        self.assertEqual(response, 0)

piccolo-1.24.0/piccolo/__init__.py

@@ -1 +0,0 @@
-__VERSION__ = "1.24.0"