[CalendarServer-changes] [7010] CalendarServer/branches/users/glyph/dalify/txdav/common/datastore/ sql.py

[source_changes at macosforge.org]

Revision: 7010
          http://trac.macosforge.org/projects/calendarserver/changeset/7010
Author:   glyph at apple.com
Date:     2011-02-16 06:40:53 -0800 (Wed, 16 Feb 2011)
Log Message:
-----------
dalify NotificationCollection.syncToken

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/dalify/txdav/common/datastore/sql.py

Modified: CalendarServer/branches/users/glyph/dalify/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/glyph/dalify/txdav/common/datastore/sql.py	2011-02-16 14:40:42 UTC (rev 7009)
+++ CalendarServer/branches/users/glyph/dalify/txdav/common/datastore/sql.py	2011-02-16 14:40:53 UTC (rev 7010)
@@ -2499,17 +2499,20 @@
             self._txn, resourceID=self._resourceID))[0][0]
 
 
+    _syncTokenQuery = Select(
+        [Max(_revisionsSchema.REVISION)], From=_revisionsSchema,
+        Where=_revisionsSchema.HOME_RESOURCE_ID == Parameter("resourceID")
+    )
+
+
     @inlineCallbacks
     def syncToken(self):
         if self._syncTokenRevision is None:
-            self._syncTokenRevision = (yield self._txn.execSQL(
-                """
-                select max(%(column_REVISION)s) from %(name)s
-                where %(column_HOME_RESOURCE_ID)s = %%s
-                """ % self._revisionsTable,
-                [self._resourceID,]
-            ))[0][0]
-        returnValue("%s#%s" % (self._resourceID, self._syncTokenRevision,))
+            self._syncTokenRevision = (
+                yield self._syncTokenRevision.on(
+                    self._txn, resourceID=self._resourceID)
+            )[0][0]
+        returnValue("%s#%s" % (self._resourceID, self._syncTokenRevision))
 
 
     def objectResourcesSinceToken(self, token):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110216/d4209794/attachment.html>