Changeset 2763

Timestamp:

02/28/06 00:14:02 (18 years ago)

Author:

jerome

Message:

Added some multiple deletions routines.

Location:

pykota/trunk/pykota/storages

Files:

• ldapstorage.py (modified) (1 diff)
• sql.py (modified) (2 diffs)

pykota/trunk/pykota/storages/ldapstorage.py

@@ -1462 +1462 @@
                 self.doDelete(group.ident)
                 
+    def deleteManyBillingCodesFromNames(self, billingcodes) :        
+        """Deletes many billing codes from their names."""
+        for bcode in self.getMatchingBillingCodes(",".join(billingcodes)) :
+            bcode.delete()
+        
+    def deleteManyUsersFromNames(self, usernames) :        
+        """Deletes many users from their names."""
+        for user in self.getMatchingUsers(",".join(usernames)) : 
+            user.delete()
+            
+    def deleteManyGroupsFromNames(self, groupnames) :        
+        """Deletes many groups from their names."""
+        for group in self.getMatchingGroups(",".join(groupnames)) : 
+            group.delete()
+        
+    def deleteManyPrintersFromNames(self, printernames) :        
+        """Deletes many printers from their names."""
+        for printer in self.getMatchingPrinters(",".join(printernames)) :
+            printer.delete()
+        
     def deleteManyUserPQuotas(self, printers, users) :        
         """Deletes many user print quota entries."""

pykota/trunk/pykota/storages/sql.py

@@ -801 +801 @@
             self.doModify(q)
             
+    def deleteInTransaction(self, queries) :        
+        """Does many deletions in a single transaction."""
+        self.beginTransaction()
+        try :
+            for q in queries :
+                self.doModify(q)
+        except :    
+            self.rollbackTransaction()
+            raise
+        else :    
+            self.commitTransaction()
+            
+    def deleteManyBillingCodesFromNames(self, billingcodes) :        
+        """Deletes many billing codes from their names."""
+        codelabels = ", ".join(["%s" % self.doQuote(b) for b in billingcodes])
+        self.deleteInTransaction([ 
+                    "DELETE FROM billingcodes WHERE billingcode IN (%s)" % codelabels,])
+            
+    def deleteManyUsersFromNames(self, usernames) :        
+        """Deletes many users from their names."""
+        usernames = ", ".join(["%s" % self.doQuote(u) for u in usernames])
+        self.deleteInTransaction([ 
+                    "DELETE FROM payments WHERE userid IN (SELECT id FROM users WHERE username IN %s)" % usernames,
+                    "DELETE FROM groupsmembers WHERE userid IN (SELECT id FROM users WHERE username IN %s)" % usernames,
+                    "DELETE FROM jobhistory WHERE userid IN (SELECT id FROM users WHERE username IN %s)" % usernames,
+                    "DELETE FROM userpquota WHERE userid IN (SELECT id FROM users WHERE username IN %s)" % usernames,
+                    "DELETE FROM users WHERE username IN %s" % usernames,])
+        
+    def deleteManyPrintersFromNames(self, printernames) :        
+        """Deletes many printers from their names."""
+        printernames = ", ".join(["%s" % self.doQuote(p) for p in printernames])
+        self.deleteInTransaction([ 
+                    "DELETE FROM printergroupsmembers WHERE groupid=%s OR printerid=%s" % (self.doQuote(printer.ident), self.doQuote(printer.ident)),
+                    "DELETE FROM jobhistory WHERE printerid=%s" % self.doQuote(printer.ident),
+                    "DELETE FROM grouppquota WHERE printerid=%s" % self.doQuote(printer.ident),
+                    "DELETE FROM userpquota WHERE printerid=%s" % self.doQuote(printer.ident),
+                    "DELETE FROM printers WHERE id=%s" % self.doQuote(printer.ident),])
+        
     def deleteManyUserPQuotas(self, printers, users) :        
         """Deletes many user print quota entries."""
         printerids = ", ".join(["%s" % self.doQuote(p.ident) for p in printers])
         userids = ", ".join(["%s" % self.doQuote(u.ident) for u in users])
-        for q in [ 
+        self.deleteInTransaction([ 
                     "DELETE FROM jobhistory WHERE userid IN (%s) AND printerid IN (%s)" \
                                  % (userids, printerids),
                     "DELETE FROM userpquota WHERE userid IN (%s) AND printerid IN (%s)" \
-                                 % (userids, printerids),
-                  ] :
-            self.doModify(q)
+                                 % (userids, printerids),])
             
     def deleteManyGroupPQuotas(self, printers, groups) :
@@ -817 +853 @@
         printerids = ", ".join(["%s" % self.doQuote(p.ident) for p in printers])
         groupids = ", ".join(["%s" % self.doQuote(g.ident) for g in groups])
-        for q in [ 
+        self.deleteInTransaction([ 
                     "DELETE FROM grouppquota WHERE groupid IN (%s) AND printerid IN (%s)" \
-                                 % (groupids, printerids),
-                  ] :
-            self.doModify(q)
+                                 % (groupids, printerids),])
         
     def deleteUserPQuota(self, upquota) :