[CalendarServer-changes] [6707] CalendarServer/trunk/txdav/common/datastore/sql.py

source_changes at macosforge.org source_changes at macosforge.org
Tue Dec 21 12:25:32 PST 2010


Revision: 6707
          http://trac.macosforge.org/projects/calendarserver/changeset/6707
Author:   cdaboo at apple.com
Date:     2010-12-21 12:25:25 -0800 (Tue, 21 Dec 2010)
Log Message:
-----------
Make sure deleted resources (but not calendars) are included in sync-token determination when doing a Depth:1 operation.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/sql.py

Modified: CalendarServer/trunk/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql.py	2010-12-21 20:24:12 UTC (rev 6706)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py	2010-12-21 20:25:25 UTC (rev 6707)
@@ -785,7 +785,7 @@
                 where
                   %(BIND:name)s.%(BIND:column_HOME_RESOURCE_ID)s = %%s and
                   %(BIND:column_BIND_MODE)s """ + ("=" if owned else "!=") + """ %%s and
-                  %(REV:column_DELETED)s = FALSE
+                  (%(REV:column_RESOURCE_NAME)s is not null or %(REV:column_DELETED)s = FALSE)
                 group by %(REV:name)s.%(REV:column_RESOURCE_ID)s
                 """) % cls._revisionsBindTable,
                 [
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20101221/7920ba45/attachment.html>


More information about the calendarserver-changes mailing list