Revision: 9322 http://trac.macosforge.org/projects/calendarserver/changeset/9322 Author: glyph@apple.com Date: 2012-06-01 08:58:23 -0700 (Fri, 01 Jun 2012) Log Message: ----------- test against original groupname/member in upgrader where clause, not modified groupname/member Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py Property Changed: ---------------- CalendarServer/trunk/ Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2012-05-31 23:06:57 UTC (rev 9321) +++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2012-06-01 15:58:23 UTC (rev 9322) @@ -801,14 +801,16 @@ if int(old_version) < 5: for (groupname, member) in ( - (yield self._db_all_values_for_sql("select GROUPNAME, MEMBER from GROUPS")) + (yield self._db_all_values_for_sql( + "select GROUPNAME, MEMBER from GROUPS")) ): grouplist = groupname.split("#") grouplist[0] = normalizeUUID(grouplist[0]) yield self._db_execute(""" update GROUPS set GROUPNAME = :1, MEMBER = :2 - where GROUPNAME = :1 and MEMBER = :2 - """, ["#".join(grouplist), normalizeUUID(member)]) + where GROUPNAME = :3 and MEMBER = :4 + """, ["#".join(grouplist), normalizeUUID(member), + groupname, member]) def _db_empty_data_tables(self):