[CalendarServer-changes] [6993] CalendarServer/branches/users/glyph/dalify/txdav/common/datastore/ sql.py
source_changes at macosforge.org
source_changes at macosforge.org
Wed Feb 16 06:37:42 PST 2011
Revision: 6993
http://trac.macosforge.org/projects/calendarserver/changeset/6993
Author: glyph at apple.com
Date: 2011-02-16 06:37:42 -0800 (Wed, 16 Feb 2011)
Log Message:
-----------
dalify initSyncToken
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:37:30 UTC (rev 6992)
+++ CalendarServer/branches/users/glyph/dalify/txdav/common/datastore/sql.py 2011-02-16 14:37:42 UTC (rev 6993)
@@ -1666,28 +1666,37 @@
returnValue((changed, deleted))
+ @classproperty
+ def _removeDeletedRevision(cls):
+ rev = cls._revisionsSchema
+ return Delete(From=rev,
+ Where=(rev.HOME_RESOURCE_ID == Parameter("homeID")).And(
+ rev.COLLECTION_NAME == Parameter("collectionName")))
+
+ @classproperty
+ def _addNewRevision(cls):
+ rev = cls._revisionsSchema
+ return Insert({rev.HOME_RESOURCE_ID: Parameter("homeID"),
+ rev.RESOURCE_ID: Parameter("resourceID"),
+ rev.COLLECTION_NAME: Parameter("collectionName"),
+ rev.RESOURCE_NAME: None,
+ # Always starts false; may be updated to be a tombstone
+ # later.
+ rev.DELETED: False},
+ Return=[rev.REVISION])
+
+
@inlineCallbacks
def _initSyncToken(self):
-
- # Remove any deleted revision entry that uses the same name
- yield self._txn.execSQL("""
- delete from %(name)s
- where %(column_HOME_RESOURCE_ID)s = %%s and %(column_COLLECTION_NAME)s = %%s
- """ % self._revisionsTable,
- [self._home._resourceID, self._name]
+ yield self._removeDeletedRevision.on(
+ self._txn, homeID=self._home._resourceID, collectionName=self._name
)
+ self._syncTokenRevision = (yield (
+ self._addNewRevision.on(self._txn, homeID=self._home._resourceID,
+ resourceID=self._resourceID,
+ collectionName=self._name)))[0][0]
- # Insert new entry
- self._syncTokenRevision = (yield self._txn.execSQL("""
- insert into %(name)s
- (%(column_HOME_RESOURCE_ID)s, %(column_RESOURCE_ID)s, %(column_COLLECTION_NAME)s, %(column_RESOURCE_NAME)s, %(column_REVISION)s, %(column_DELETED)s)
- values (%%s, %%s, %%s, null, nextval('%(sequence)s'), FALSE)
- returning %(column_REVISION)s
- """ % self._revisionsTable,
- [self._home._resourceID, self._resourceID, self._name]
- ))[0][0]
-
@inlineCallbacks
def _updateSyncToken(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110216/dff057a7/attachment.html>
More information about the calendarserver-changes
mailing list