Changeset 1079 for pykota/trunk/pykota/storages
- Timestamp:
- 07/09/03 22:17:07 (21 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
pykota/trunk/pykota/storages/pgstorage.py
r1068 r1079 21 21 # 22 22 # $Log$ 23 # Revision 1.7 2003/07/09 20:17:07 jalet 24 # Email field added to PostgreSQL schema 25 # 23 26 # Revision 1.6 2003/07/07 11:49:24 jalet 24 27 # 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.""" 284 287 usersandquotas = [] 285 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))288 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)) 286 289 if result : 287 290 for record in result : … … 292 295 user.AccountBalance = record.get("balance") 293 296 user.LifeTimePaid = record.get("lifetimepaid") 294 user.Email = record.get("email") # TODO : Always None here297 user.Email = record.get("email") 295 298 user.Exists = 1 296 299 userpquota = StorageUserPQuota(self, user, printer)