datajoint#151 part 2

Author: CBroz1

datajoint/table.py

@@ -486,6 +486,7 @@ def delete(
         transaction: bool = True,
         safemode: Union[bool, None] = None,
         force_parts: bool = False,
+        include_master: bool = True,
     ) -> int:
         """
         Deletes the contents of the table and its dependent tables, recursively.
@@ -497,6 +498,7 @@ def delete(
             safemode: If `True`, prohibit nested transactions and prompt to confirm. Default
                 is `dj.config['safemode']`.
             force_parts: Delete from parts even when not deleting from their masters.
+            include_master: If `True`, delete from the master table as well. Default is `True`.
 
         Returns:
             Number of deleted rows (excluding those from dependent tables).
@@ -565,7 +567,22 @@ def cascade(table):
                         )
                     else:
                         child &= table.proj()
+
+                    master = get_master(child.full_table_name)
+                    if include_master and master and master not in deleted:
+                        master_table = FreeTable(table.connection, master)
+                        master_table._restriction = [
+                            make_condition(
+                                master_table,
+                                (master_table & child).proj().fetch(),
+                                set(),
+                            )
+                        ]
+
                     cascade(child)
+
+                    if include_master and master and master not in deleted:
+                        cascade(master_table)
                 else:
                     deleted.add(table.full_table_name)
                     logger.info(

tests/test_cascading_delete.py

@@ -110,11 +110,17 @@ def test_delete_master(schema_simp_pop):
     Profile().delete()
 
 
-def test_delete_parts(schema_simp_pop):
+def test_delete_parts_error(schema_simp_pop):
     """test issue #151"""
     with pytest.raises(dj.DataJointError):
         Profile().populate_random()
-        Website().delete()
+        Website().delete(include_master=False)
+
+
+def test_delete_parts(schema_simp_pop):
+    """test issue #151"""
+    Profile().populate_random()
+    Website().delete(include_master=True)
 
 
 def test_drop_part(schema_simp_pop):