[CalendarServer-changes] [14388] CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav
source_changes at macosforge.org
source_changes at macosforge.org
Mon Feb 9 13:55:12 PST 2015
Revision: 14388
http://trac.calendarserver.org//changeset/14388
Author: cdaboo at apple.com
Date: 2015-02-09 13:55:12 -0800 (Mon, 09 Feb 2015)
Log Message:
-----------
Fixes for last commit.
Modified Paths:
--------------
CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/caldav/datastore/sql.py
CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/carddav/datastore/sql.py
CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/home_sync.py
CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/test/test_conduit.py
CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/sql.py
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/caldav/datastore/sql.py 2015-02-09 20:43:28 UTC (rev 14387)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/caldav/datastore/sql.py 2015-02-09 21:55:12 UTC (rev 14388)
@@ -413,8 +413,9 @@
# structured tables. (new, preferred)
_homeSchema = schema.CALENDAR_HOME
+ _homeMetaDataSchema = schema.CALENDAR_HOME_METADATA
+
_bindSchema = schema.CALENDAR_BIND
- _homeMetaDataSchema = schema.CALENDAR_HOME_METADATA
_revisionsSchema = schema.CALENDAR_OBJECT_REVISIONS
_objectSchema = schema.CALENDAR_OBJECT
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/carddav/datastore/sql.py 2015-02-09 20:43:28 UTC (rev 14387)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/carddav/datastore/sql.py 2015-02-09 21:55:12 UTC (rev 14388)
@@ -77,8 +77,9 @@
# structured tables. (new, preferred)
_homeSchema = schema.ADDRESSBOOK_HOME
+ _homeMetaDataSchema = schema.ADDRESSBOOK_HOME_METADATA
+
_bindSchema = schema.SHARED_ADDRESSBOOK_BIND
- _homeMetaDataSchema = schema.ADDRESSBOOK_HOME_METADATA
_revisionsSchema = schema.ADDRESSBOOK_OBJECT_REVISIONS
_objectSchema = schema.ADDRESSBOOK_OBJECT
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/home_sync.py
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/home_sync.py 2015-02-09 20:43:28 UTC (rev 14387)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/home_sync.py 2015-02-09 21:55:12 UTC (rev 14388)
@@ -172,6 +172,9 @@
rows, recalculate quota etc.
"""
+ # TODO: Re-write attachment URIs - not sure if we need this as reverse proxy may take care of it
+ pass
+
# TODO: shared collections reconcile
pass
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/test/test_conduit.py
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/test/test_conduit.py 2015-02-09 20:43:28 UTC (rev 14387)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/test/test_conduit.py 2015-02-09 21:55:12 UTC (rev 14388)
@@ -362,11 +362,11 @@
yield self.createShare("user01", "puser01")
calendar1 = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(0), home="user01", name="calendar")
- token1_1 = yield calendar1.syncToken()
+ token1_1 = yield calendar1.syncTokenRevision()
yield self.commitTransaction(0)
shared = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(1), home="puser01", name="shared-calendar")
- token2_1 = yield shared.syncToken()
+ token2_1 = yield shared.syncTokenRevision()
yield self.commitTransaction(1)
self.assertEqual(token1_1, token2_1)
@@ -376,11 +376,11 @@
yield self.commitTransaction(0)
calendar1 = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(0), home="user01", name="calendar")
- token1_2 = yield calendar1.syncToken()
+ token1_2 = yield calendar1.syncTokenRevision()
yield self.commitTransaction(0)
shared = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(1), home="puser01", name="shared-calendar")
- token2_2 = yield shared.syncToken()
+ token2_2 = yield shared.syncTokenRevision()
yield self.commitTransaction(1)
self.assertNotEqual(token1_1, token1_2)
@@ -394,11 +394,11 @@
yield self.commitTransaction(0)
calendar1 = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(0), home="user01", name="calendar")
- token1_3 = yield calendar1.syncToken()
+ token1_3 = yield calendar1.syncTokenRevision()
yield self.commitTransaction(0)
shared = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(1), home="puser01", name="shared-calendar")
- token2_3 = yield shared.syncToken()
+ token2_3 = yield shared.syncTokenRevision()
yield self.commitTransaction(1)
self.assertNotEqual(token1_1, token1_3)
Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/sql.py 2015-02-09 20:43:28 UTC (rev 14387)
+++ CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/sql.py 2015-02-09 21:55:12 UTC (rev 14388)
@@ -2988,11 +2988,16 @@
# All these need to be initialized by derived classes for each store type
_homeType = None
- _homeTable = None
- _homeMetaDataTable = None
+ _homeSchema = None
+ _homeMetaDataSchema = None
+
_externalClass = None
_childClass = None
- _childTable = None
+
+ _bindSchema = None
+ _revisionsSchema = None
+ _objectSchema = None
+
_notifierPrefix = None
_dataVersionKey = None
@@ -3415,7 +3420,7 @@
Where=r.HOME_RESOURCE_ID == self._resourceID,
).on(self._txn)
- h = self._homeTable
+ h = self._homeSchema
yield Delete(
From=h,
Where=h.RESOURCE_ID == self._resourceID,
@@ -3432,7 +3437,8 @@
Remove each child.
"""
- for child in (yield self.loadChildren()):
+ children = yield self.loadChildren()
+ for child in children:
yield child.remove()
self._children.pop(child.name(), None)
self._children.pop(child.id(), None)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150209/aa835c90/attachment-0001.html>
More information about the calendarserver-changes
mailing list