Changeset 3139

Timestamp:

01/28/07 21:53:07 (17 years ago)

Author:

jerome

Message:

Fixed a bug which caused edpykota (and other) to fail when
deleting unexisting entries. (The result was correct anyway
because there was nothing to do, but the traceback looked ugly)

Files:

• pykota/trunk/pykota/storages/sql.py (modified) (6 diffs)

pykota/trunk/pykota/storages/sql.py

@@ -827 +827 @@
         """Deletes many billing codes."""
         codeids = ", ".join(["%s" % self.doQuote(b.ident) for b in billingcodes])
-        self.multipleQueriesInTransaction([ 
+        if codeids :
+            self.multipleQueriesInTransaction([ 
                     "DELETE FROM billingcodes WHERE id IN (%s)" % codeids,])
             
@@ -833 +834 @@
         """Deletes many users."""
         userids = ", ".join(["%s" % self.doQuote(u.ident) for u in users])
-        self.multipleQueriesInTransaction([ 
+        if userids :
+            self.multipleQueriesInTransaction([ 
                     "DELETE FROM payments WHERE userid IN (%s)" % userids,
                     "DELETE FROM groupsmembers WHERE userid IN (%s)" % userids,
@@ -843 +845 @@
         """Deletes many groups."""
         groupids = ", ".join(["%s" % self.doQuote(g.ident) for g in groups])
-        self.multipleQueriesInTransaction([ 
+        if groupids :
+            self.multipleQueriesInTransaction([ 
                     "DELETE FROM groupsmembers WHERE groupid IN (%s)" % groupids,
                     "DELETE FROM grouppquota WHERE groupid IN (%s)" % groupids,
@@ -851 +854 @@
         """Deletes many printers."""
         printerids = ", ".join(["%s" % self.doQuote(p.ident) for p in printers])
-        self.multipleQueriesInTransaction([ 
+        if printerids :
+            self.multipleQueriesInTransaction([ 
                     "DELETE FROM printergroupsmembers WHERE groupid IN (%s) OR printerid IN (%s)" % (printerids, printerids),
                     "DELETE FROM jobhistory WHERE printerid IN (%s)" % printerids,
@@ -862 +866 @@
         printerids = ", ".join(["%s" % self.doQuote(p.ident) for p in printers])
         userids = ", ".join(["%s" % self.doQuote(u.ident) for u in users])
-        self.multipleQueriesInTransaction([ 
+        if userids and printerids :
+            self.multipleQueriesInTransaction([ 
                     "DELETE FROM jobhistory WHERE userid IN (%s) AND printerid IN (%s)" \
                                  % (userids, printerids),
@@ -872 +877 @@
         printerids = ", ".join(["%s" % self.doQuote(p.ident) for p in printers])
         groupids = ", ".join(["%s" % self.doQuote(g.ident) for g in groups])
-        self.multipleQueriesInTransaction([ 
+        if groupids and printerids :
+            self.multipleQueriesInTransaction([ 
                     "DELETE FROM grouppquota WHERE groupid IN (%s) AND printerid IN (%s)" \
                                  % (groupids, printerids),])