Changeset 1079 for pykota/trunk/pykota/storages/pgstorage.py

Timestamp:

07/09/03 22:17:07 (21 years ago)

Author:

jalet

Message:

Email field added to PostgreSQL schema

Files:

• pykota/trunk/pykota/storages/pgstorage.py (modified) (3 diffs)

pykota/trunk/pykota/storages/pgstorage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.7  2003/07/09 20:17:07  jalet
+# Email field added to PostgreSQL schema
+#
 # Revision 1.6  2003/07/07 11:49:24  jalet
 # Lots of small fixes with the help of PyChecker
@@ -283 +286 @@
         """Returns the list of users who uses a given printer, along with their quotas."""
         usersandquotas = []
-        result = self.doSearch("SELECT users.id as uid,username,balance,lifetimepaid,limitby,userpquota.id,lifepagecounter,pagecounter,softlimit,hardlimit,datelimit FROM users JOIN userpquota ON users.id=userpquota.userid AND printerid=%s ORDER BY username ASC" % self.doQuote(printer.ident))
+        result = self.doSearch("SELECT users.id as uid,username,balance,lifetimepaid,limitby,email,userpquota.id,lifepagecounter,pagecounter,softlimit,hardlimit,datelimit FROM users JOIN userpquota ON users.id=userpquota.userid AND printerid=%s ORDER BY username ASC" % self.doQuote(printer.ident))
         if result :
             for record in result :
@@ -292 +295 @@
                     user.AccountBalance = record.get("balance")
                     user.LifeTimePaid = record.get("lifetimepaid")
-                    user.Email = record.get("email")    # TODO : Always None here
+                    user.Email = record.get("email") 
                     user.Exists = 1
                     userpquota = StorageUserPQuota(self, user, printer)