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

Author: dantownsend

piccolo/columns/combination.py

@@ -45,11 +45,11 @@ def querystring(self) -> QueryString:
         )
 
     @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 @@ def __init__(self, sql: str, *args: t.Any) -> None:
         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 @@ def querystring(self) -> QueryString:
         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/query/methods/delete.py

@@ -61,7 +61,7 @@ def default_querystrings(self) -> t.Sequence[QueryString]:
             querystring = QueryString(
                 "{} WHERE {}",
                 querystring,
-                self.where_delegate._where.querystring,
+                self.where_delegate._where.querystring_for_update_and_delete,
             )
 
         if self.returning_delegate._returning:

piccolo/query/methods/update.py

@@ -104,7 +104,7 @@ def default_querystrings(self) -> t.Sequence[QueryString]:
             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:

tests/table/test_delete.py

@@ -44,3 +44,18 @@ def test_validation(self):
             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)