Merge pull request #134 from ssweber/fix-delete

Fix sqldriver to not delete NON update_cascade children

Author: PySimpleSQL

pysimplesql/pysimplesql.py

@@ -1382,7 +1382,10 @@ def delete_record(self, cascade:bool=True): # TODO: check return type, we return
             return
 
         # Delete child records first!
-        self.driver.delete_record(self, True)
+        result = self.driver.delete_record(self, True)
+        
+        if result.exception is not None:
+            sg.popup(f"Query Failed! {result.exception}", keep_on_top=True)
 
         # callback
         if 'after_delete' in self.callbacks.keys():
@@ -4304,10 +4307,12 @@ def generate_query(self, dataset: DataSet, join_clause: bool = True, where_claus
     def delete_record(self, dataset: DataSet, cascade=True): # TODO: get ON DELETE CASCADE from db
         # Delete child records first!
         if cascade:
+            child_deleted = []
             for _ in dataset.frm.datasets:
                 for r in dataset.frm.relationships:
-                    if r.parent_table == dataset.table:
+                    if r.parent_table == dataset.table and r.update_cascade and (r.child_table not in child_deleted):
                         child = self.quote_table(r.child_table)
+                        child_deleted.append(child)
                         fk_column = self.quote_column(r.fk_column)
                         q = f'DELETE FROM {child} WHERE {fk_column}={dataset.get_current(dataset.pk_column)}'
                         self.execute(q)
@@ -4317,7 +4322,7 @@ def delete_record(self, dataset: DataSet, cascade=True): # TODO: get ON DELETE C
         table = self.quote_table(dataset.table)
         pk_column = self.quote_column(dataset.pk_column)
         q = f'DELETE FROM {table} WHERE {pk_column}={dataset.get_current(dataset.pk_column)};'
-        self.execute(q)
+        return self.execute(q)
 
     def duplicate_record(self, dataset: DataSet, cascade: bool) -> ResultSet:
         ## https://stackoverflow.com/questions/1716320/how-to-insert-duplicate-rows-in-sqlite-with-a-unique-id