<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14388] CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14388">14388</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-02-09 13:55:12 -0800 (Mon, 09 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes for last commit.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationtxdavcaldavdatastoresqlpy">CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationtxdavcarddavdatastoresqlpy">CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/carddav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationtxdavcommondatastorepoddingmigrationhome_syncpy">CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/home_sync.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationtxdavcommondatastorepoddingtesttest_conduitpy">CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/test/test_conduit.py</a></li>
<li><a href="#CalendarServerbranchesuserscdaboopod2podmigrationtxdavcommondatastoresqlpy">CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserscdaboopod2podmigrationtxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/caldav/datastore/sql.py (14387 => 14388)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -413,8 +413,9 @@
</span><span class="cx">
</span><span class="cx"> # structured tables. (new, preferred)
</span><span class="cx"> _homeSchema = schema.CALENDAR_HOME
</span><ins>+ _homeMetaDataSchema = schema.CALENDAR_HOME_METADATA
+
</ins><span class="cx"> _bindSchema = schema.CALENDAR_BIND
</span><del>- _homeMetaDataSchema = schema.CALENDAR_HOME_METADATA
</del><span class="cx"> _revisionsSchema = schema.CALENDAR_OBJECT_REVISIONS
</span><span class="cx"> _objectSchema = schema.CALENDAR_OBJECT
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboopod2podmigrationtxdavcarddavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/carddav/datastore/sql.py (14387 => 14388)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -77,8 +77,9 @@
</span><span class="cx">
</span><span class="cx"> # structured tables. (new, preferred)
</span><span class="cx"> _homeSchema = schema.ADDRESSBOOK_HOME
</span><ins>+ _homeMetaDataSchema = schema.ADDRESSBOOK_HOME_METADATA
+
</ins><span class="cx"> _bindSchema = schema.SHARED_ADDRESSBOOK_BIND
</span><del>- _homeMetaDataSchema = schema.ADDRESSBOOK_HOME_METADATA
</del><span class="cx"> _revisionsSchema = schema.ADDRESSBOOK_OBJECT_REVISIONS
</span><span class="cx"> _objectSchema = schema.ADDRESSBOOK_OBJECT
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboopod2podmigrationtxdavcommondatastorepoddingmigrationhome_syncpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/migration/home_sync.py (14387 => 14388)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -172,6 +172,9 @@
</span><span class="cx"> rows, recalculate quota etc.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ # TODO: Re-write attachment URIs - not sure if we need this as reverse proxy may take care of it
+ pass
+
</ins><span class="cx"> # TODO: shared collections reconcile
</span><span class="cx"> pass
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboopod2podmigrationtxdavcommondatastorepoddingtesttest_conduitpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/podding/test/test_conduit.py (14387 => 14388)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -362,11 +362,11 @@
</span><span class="cx"> yield self.createShare("user01", "puser01")
</span><span class="cx">
</span><span class="cx"> calendar1 = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(0), home="user01", name="calendar")
</span><del>- token1_1 = yield calendar1.syncToken()
</del><ins>+ token1_1 = yield calendar1.syncTokenRevision()
</ins><span class="cx"> yield self.commitTransaction(0)
</span><span class="cx">
</span><span class="cx"> shared = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(1), home="puser01", name="shared-calendar")
</span><del>- token2_1 = yield shared.syncToken()
</del><ins>+ token2_1 = yield shared.syncTokenRevision()
</ins><span class="cx"> yield self.commitTransaction(1)
</span><span class="cx">
</span><span class="cx"> self.assertEqual(token1_1, token2_1)
</span><span class="lines">@@ -376,11 +376,11 @@
</span><span class="cx"> yield self.commitTransaction(0)
</span><span class="cx">
</span><span class="cx"> calendar1 = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(0), home="user01", name="calendar")
</span><del>- token1_2 = yield calendar1.syncToken()
</del><ins>+ token1_2 = yield calendar1.syncTokenRevision()
</ins><span class="cx"> yield self.commitTransaction(0)
</span><span class="cx">
</span><span class="cx"> shared = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(1), home="puser01", name="shared-calendar")
</span><del>- token2_2 = yield shared.syncToken()
</del><ins>+ token2_2 = yield shared.syncTokenRevision()
</ins><span class="cx"> yield self.commitTransaction(1)
</span><span class="cx">
</span><span class="cx"> self.assertNotEqual(token1_1, token1_2)
</span><span class="lines">@@ -394,11 +394,11 @@
</span><span class="cx"> yield self.commitTransaction(0)
</span><span class="cx">
</span><span class="cx"> calendar1 = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(0), home="user01", name="calendar")
</span><del>- token1_3 = yield calendar1.syncToken()
</del><ins>+ token1_3 = yield calendar1.syncTokenRevision()
</ins><span class="cx"> yield self.commitTransaction(0)
</span><span class="cx">
</span><span class="cx"> shared = yield self.calendarUnderTest(txn=self.theTransactionUnderTest(1), home="puser01", name="shared-calendar")
</span><del>- token2_3 = yield shared.syncToken()
</del><ins>+ token2_3 = yield shared.syncTokenRevision()
</ins><span class="cx"> yield self.commitTransaction(1)
</span><span class="cx">
</span><span class="cx"> self.assertNotEqual(token1_1, token1_3)
</span></span></pre></div>
<a id="CalendarServerbranchesuserscdaboopod2podmigrationtxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/cdaboo/pod2pod-migration/txdav/common/datastore/sql.py (14387 => 14388)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2988,11 +2988,16 @@
</span><span class="cx">
</span><span class="cx"> # All these need to be initialized by derived classes for each store type
</span><span class="cx"> _homeType = None
</span><del>- _homeTable = None
- _homeMetaDataTable = None
</del><ins>+ _homeSchema = None
+ _homeMetaDataSchema = None
+
</ins><span class="cx"> _externalClass = None
</span><span class="cx"> _childClass = None
</span><del>- _childTable = None
</del><ins>+
+ _bindSchema = None
+ _revisionsSchema = None
+ _objectSchema = None
+
</ins><span class="cx"> _notifierPrefix = None
</span><span class="cx">
</span><span class="cx"> _dataVersionKey = None
</span><span class="lines">@@ -3415,7 +3420,7 @@
</span><span class="cx"> Where=r.HOME_RESOURCE_ID == self._resourceID,
</span><span class="cx"> ).on(self._txn)
</span><span class="cx">
</span><del>- h = self._homeTable
</del><ins>+ h = self._homeSchema
</ins><span class="cx"> yield Delete(
</span><span class="cx"> From=h,
</span><span class="cx"> Where=h.RESOURCE_ID == self._resourceID,
</span><span class="lines">@@ -3432,7 +3437,8 @@
</span><span class="cx"> Remove each child.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- for child in (yield self.loadChildren()):
</del><ins>+ children = yield self.loadChildren()
+ for child in children:
</ins><span class="cx"> yield child.remove()
</span><span class="cx"> self._children.pop(child.name(), None)
</span><span class="cx"> self._children.pop(child.id(), None)
</span></span></pre>
</div>
</div>
</body>
</html>