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

[source_changes at macosforge.org]

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

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:53 UTC (rev 7010)
+++ CalendarServer/branches/users/glyph/dalify/txdav/common/datastore/sql.py	2011-02-16 14:41:04 UTC (rev 7011)
@@ -2519,17 +2519,21 @@
         raise NotImplementedError()
 
 
+    _resourceNamesSinceTokenQuery = Select(
+        [_revisionsSchema.RESOURCE_NAME, _revisionsSchema.DELETED],
+        From=_revisionsSchema,
+        Where=(_revisionsSchema.REVISION > Parameter("revision")).And(
+            _revisionsSchema.HOME_RESOURCE_ID == Parameter("homeID")
+        )
+    )
+
     @inlineCallbacks
     def resourceNamesSinceToken(self, token):
         results = [
             (name if name else "", deleted)
             for name, deleted in
-            (yield self._txn.execSQL("""
-                select %(column_RESOURCE_NAME)s, %(column_DELETED)s from %(name)s
-                where %(column_REVISION)s > %%s and %(column_HOME_RESOURCE_ID)s = %%s
-                """ % self._revisionsTable,
-                [token, self._resourceID],
-            ))
+            (yield self._resourceNamesSinceTokenQuery.on(
+                self._txn, revision=token, homeID=self._resourceID))
         ]
         results.sort(key=lambda x:x[1])
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110216/059c0084/attachment.html>