[CalendarServer-changes] [8798] CalendarServer/branches/users/glyph/case-insensitive-uid

[source_changes at macosforge.org]

Revision: 8798
          http://trac.macosforge.org/projects/calendarserver/changeset/8798
Author:   glyph at apple.com
Date:     2012-02-29 10:16:23 -0800 (Wed, 29 Feb 2012)
Log Message:
-----------
minor fixes

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/case-insensitive-uid/txdav/common/datastore/upgrade/sql/upgrade.py

Property Changed:
----------------
    CalendarServer/branches/users/glyph/case-insensitive-uid/

Modified: CalendarServer/branches/users/glyph/case-insensitive-uid/txdav/common/datastore/upgrade/sql/upgrade.py
===================================================================
--- CalendarServer/branches/users/glyph/case-insensitive-uid/txdav/common/datastore/upgrade/sql/upgrade.py	2012-02-29 18:16:21 UTC (rev 8797)
+++ CalendarServer/branches/users/glyph/case-insensitive-uid/txdav/common/datastore/upgrade/sql/upgrade.py	2012-02-29 18:16:23 UTC (rev 8798)
@@ -380,9 +380,12 @@
         once the schema is upgraded.
         """
         home = getattr(schema, type + '_HOME')
-        oldHomes = Select([home.OWNER_UID], From=home,
-                          Where=home.OWNER_UID.StartsWith(_CASE_DUPLICATE_PREFIX))
+        oldHomes = yield Select(
+            [home.OWNER_UID], From=home,
+            Where=home.OWNER_UID.StartsWith(_CASE_DUPLICATE_PREFIX)
+        ).on(sqlTxn)
         for oldHomeUID in oldHomes:
+            oldHomeUID = oldHomeUID[0]
             newHomeUID = oldHomeUID[len(_CASE_DUPLICATE_PREFIX):]
             if type == 'CALENDAR':
                 from txdav.caldav.datastore.util import migrateHome
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120229/678113fb/attachment.html>