<!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>[15009] CalendarServer/trunk/txdav/common/datastore</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/15009">15009</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-07-27 18:16:55 -0700 (Mon, 27 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use Record API for the imip token upgrade test</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_56_to_57sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_56_to_57.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreupgradesqltesttest_upgrade_with_datapy">CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade_with_data.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_56_to_57sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_56_to_57.sql (15008 => 15009)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_56_to_57.sql 2015-07-28 01:01:05 UTC (rev 15008)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_56_to_57.sql 2015-07-28 01:16:55 UTC (rev 15009)
</span><span class="lines">@@ -18,7 +18,10 @@
</span><span class="cx"> -- Upgrade database schema from VERSION 56 to 57 --
</span><span class="cx"> ---------------------------------------------------
</span><span class="cx">
</span><ins>+-- pre-delete any that would conflict during the update
</ins><span class="cx"> delete from IMIP_TOKENS where (ORGANIZER, ATTENDEE, ICALUID) in (select concat('urn:uuid:', substr(ORGANIZER, 11)), ATTENDEE, ICALUID from IMIP_TOKENS where substr(ORGANIZER, 1, 10) = 'urn:x-uid:');
</span><ins>+
+-- convert the old-style urn:uuid: CUAs to new style urn:x-uid:
</ins><span class="cx"> update IMIP_TOKENS set ORGANIZER = concat('urn:x-uid:', substr(ORGANIZER, 10)) where substr(ORGANIZER, 1, 9) = 'urn:uuid:';
</span><span class="cx">
</span><span class="cx"> -- update the version
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreupgradesqltesttest_upgrade_with_datapy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade_with_data.py (15008 => 15009)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade_with_data.py 2015-07-28 01:01:05 UTC (rev 15008)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade_with_data.py 2015-07-28 01:16:55 UTC (rev 15009)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twisted.trial.unittest import TestCase
</span><span class="cx">
</span><ins>+from txdav.caldav.datastore.scheduling.imip.token import iMIPTokenRecord
</ins><span class="cx"> from txdav.caldav.datastore.scheduling.work import ScheduleReplyWork, \
</span><span class="cx"> ScheduleWork
</span><span class="cx"> from txdav.common.datastore.sql_tables import _populateSchema
</span><span class="lines">@@ -305,38 +306,37 @@
</span><span class="cx"> """
</span><span class="cx"> Old-style canonical CUAs (urn:uuid:) are converted to new style (urn:x-uid:)
</span><span class="cx"> """
</span><del>- schema = yield self._loadOldSchema(self.upgradePath.child("v56.sql"))
</del><span class="cx">
</span><del>- txn = self.store.newTransaction("loadData")
</del><ins>+ # Load old schema and populate with data
+ yield self._loadOldSchema(self.upgradePath.child("v56.sql"))
</ins><span class="cx">
</span><span class="cx"> # Add two tokens records crafted to simulate conflicting old-style and
</span><span class="cx"> # new style CUAs -- the result should be only the new-style copy.
</span><del>- yield Insert(
- {
- schema.IMIP_TOKENS.TOKEN: "123",
- schema.IMIP_TOKENS.ORGANIZER: "urn:uuid:PLUGH",
- schema.IMIP_TOKENS.ATTENDEE: "mailto:user@example.com",
- schema.IMIP_TOKENS.ICALUID: "XYZZY",
- }
- ).on(txn)
- yield Insert(
- {
- schema.IMIP_TOKENS.TOKEN: "456",
- schema.IMIP_TOKENS.ORGANIZER: "urn:x-uid:PLUGH",
- schema.IMIP_TOKENS.ATTENDEE: "mailto:user@example.com",
- schema.IMIP_TOKENS.ICALUID: "XYZZY",
- }
- ).on(txn)
</del><ins>+ txn = self.store.newTransaction("loadData")
+ yield iMIPTokenRecord.create(
+ txn,
+ token="123",
+ organizer="urn:uuid:PLUGH",
+ attendee="mailto:user@example.com",
+ icaluid="XYZZY"
+ )
+ yield iMIPTokenRecord.create(
+ txn,
+ token="456",
+ organizer="urn:x-uid:PLUGH",
+ attendee="mailto:user@example.com",
+ icaluid="XYZZY"
+ )
+ yield txn.commit()
</ins><span class="cx">
</span><del>- yield txn.commit()
</del><span class="cx"> upgrader = UpgradeDatabaseSchemaStep(self.store)
</span><span class="cx"> yield upgrader.databaseUpgrade()
</span><span class="cx">
</span><span class="cx"> txn = self.store.newTransaction("loadData")
</span><del>- tokens = yield Select(
- From=schema.IMIP_TOKENS,
- ).on(txn)
</del><ins>+ tokens = yield iMIPTokenRecord.all(txn)
</ins><span class="cx">
</span><span class="cx"> self.assertEqual(len(tokens), 1)
</span><del>- self.assertEqual(list(tokens[0])[1], "urn:x-uid:PLUGH")
</del><ins>+ token = list(tokens)[0]
+ self.assertEqual(token.token, "456")
+ self.assertEqual(token.organizer, "urn:x-uid:PLUGH")
</ins><span class="cx"> yield txn.commit()
</span></span></pre>
</div>
</div>
</body>
</html>