Changeset 2707 for pykota/trunk/pykota/storages

Timestamp:

02/18/06 11:56:29 (18 years ago)

Author:

jerome

Message:

Improved user modification speed by around 15%.

Location:

pykota/trunk/pykota/storages

Files:

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

pykota/trunk/pykota/storages/ldapstorage.py

@@ -1048 +1048 @@
         self.doModify(user.ident, newfields)
         
+        newfields = { "pykotaBalance" : str(user.AccountBalance or 0.0),
+                      "pykotaLifeTimePaid" : str(user.LifeTimePaid or 0.0), 
+                    }
+        self.doModify(user.idbalance, newfields)
+        
     def saveGroup(self, group) :
         """Saves the group to the database in a single operation."""
@@ -1096 +1101 @@
         return self.doModify(user.idbalance, fields, flushcache=1)         
        
-    def writeUserAccountBalance(self, user, newbalance, newlifetimepaid=None) :    
-        """Sets the new account balance and eventually new lifetime paid."""
-        fields = {
-                   "pykotaBalance" : str(newbalance),
-                 }
-        if newlifetimepaid is not None :
-            fields.update({ "pykotaLifeTimePaid" : str(newlifetimepaid) })
-        return self.doModify(user.idbalance, fields)         
-            
     def writeNewPayment(self, user, amount, comment="") :
         """Adds a new payment to the payments history."""

pykota/trunk/pykota/storages/sql.py

@@ -572 +572 @@
     def saveUser(self, user) :        
         """Saves the user to the database in a single operation."""
-        self.doModify("UPDATE users SET limitby=%s, email=%s, overcharge=%s, description=%s WHERE id=%s" \
+        self.doModify("UPDATE users SET limitby=%s, balance=%s, lifetimepaid=%s, email=%s, overcharge=%s, description=%s WHERE id=%s" \
                                % (self.doQuote(user.LimitBy or 'quota'), \
+                                  self.doQuote(user.AccountBalance or 0.0), \
+                                  self.doQuote(user.LifeTimePaid or 0.0), \
                                   self.doQuote(user.Email), \
                                   self.doQuote(user.OverCharge), \
@@ -618 +620 @@
         self.doModify("UPDATE users SET balance=balance - %s WHERE id=%s" % (self.doQuote(amount), self.doQuote(user.ident)))
        
-    def writeUserAccountBalance(self, user, newbalance, newlifetimepaid=None) :    
-        """Sets the new account balance and eventually new lifetime paid."""
-        if newlifetimepaid is not None :
-            self.doModify("UPDATE users SET balance=%s, lifetimepaid=%s WHERE id=%s" % (self.doQuote(newbalance), self.doQuote(newlifetimepaid), self.doQuote(user.ident)))
-        else :    
-            self.doModify("UPDATE users SET balance=%s WHERE id=%s" % (self.doQuote(newbalance), self.doQuote(user.ident)))
-            
     def writeNewPayment(self, user, amount, comment="") :
         """Adds a new payment to the payments history."""