<!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>[15468] CalendarServer/trunk/twistedcaldav</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/15468">15468</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2016-03-01 13:17:13 -0800 (Tue, 01 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure null entries in old resourceinfo.sql databases don't prevent upgrade/migration from happening.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavtesttest_upgradepy">CalendarServer/trunk/twistedcaldav/test/test_upgrade.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavupgradepy">CalendarServer/trunk/twistedcaldav/upgrade.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavtesttest_upgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/test/test_upgrade.py (15467 => 15468)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/test/test_upgrade.py        2016-03-01 21:14:32 UTC (rev 15467)
+++ CalendarServer/trunk/twistedcaldav/test/test_upgrade.py        2016-03-01 21:17:13 UTC (rev 15468)
</span><span class="lines">@@ -14,29 +14,32 @@
</span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><span class="cx">
</span><del>-import cPickle
-import hashlib
-import os
-import zlib
</del><span class="cx">
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, succeed
</span><span class="cx"> from twisted.python.filepath import FilePath
</span><ins>+from twisted.python.reflect import namedClass
+
</ins><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twistedcaldav.directory.calendaruserproxy import ProxySqliteDB
</span><ins>+from twistedcaldav.directory.resourceinfo import ResourceInfoDatabase
</ins><span class="cx"> from twistedcaldav.test.util import StoreTestCase
</span><del>-from twistedcaldav.upgrade import (
- xattrname, upgradeData, updateFreeBusySet,
- removeIllegalCharacters, normalizeCUAddrs,
- loadDelegatesFromXMLintoProxyDB, migrateDelegatesToStore,
- upgradeResourcesXML, upgradeAugmentsXML
-)
</del><ins>+from twistedcaldav.upgrade import xattrname, upgradeData, updateFreeBusySet, \
+ removeIllegalCharacters, normalizeCUAddrs, \
+ loadDelegatesFromXMLintoProxyDB, migrateDelegatesToStore, \
+ upgradeResourcesXML, upgradeAugmentsXML, migrateAutoSchedule
+
</ins><span class="cx"> from txdav.caldav.datastore.index_file import db_basename
</span><span class="cx"> from txdav.caldav.datastore.scheduling.imip.mailgateway import MailGatewayTokensDatabase
</span><span class="cx"> from txdav.who.delegates import Delegates
</span><span class="cx"> from txdav.xml.parser import WebDAVDocument
</span><span class="cx">
</span><ins>+import cPickle
+import hashlib
+import os
+import zlib
</ins><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> freeBusyAttr = xattrname(
</span><span class="cx"> "{urn:ietf:params:xml:ns:caldav}calendar-free-busy-set"
</span><span class="cx"> )
</span><span class="lines">@@ -1505,6 +1508,50 @@
</span><span class="cx"> sqliteProxyService.close()
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def test_migrateAutoSchedule(self):
+
+ serviceClass = {
+ "xml": "twistedcaldav.directory.augment.AugmentXMLDB",
+ }
+ augmentClass = namedClass(serviceClass[config.AugmentService.type])
+
+ # Auto-schedule not currently set
+ augmentService = augmentClass(**config.AugmentService.params)
+ augmentRecord = (
+ yield augmentService.getAugmentRecord(
+ "mercury",
+ "locations"
+ )
+ )
+ self.assertEqual(augmentRecord.autoScheduleMode, "default")
+
+ # Create bogus record in resourceinfo db
+ resourceInfoDatabase = ResourceInfoDatabase(config.DataRoot)
+ resourceInfoDatabase._db_execute(
+ "insert into RESOURCEINFO (GUID, AUTOSCHEDULE) values (:1, :2)",
+ "mercury", 1,
+ )
+ resourceInfoDatabase._db_execute(
+ "insert into RESOURCEINFO (GUID, AUTOSCHEDULE) values (:1, :2)",
+ None, 1,
+ )
+ resourceInfoDatabase._db_commit()
+
+ # Migrate auto-schedule from sqlite into directory
+ yield migrateAutoSchedule(config, self.directory)
+
+ # Auto-schedule now set
+ augmentService = augmentClass(**config.AugmentService.params)
+ augmentRecord = (
+ yield augmentService.getAugmentRecord(
+ "mercury",
+ "locations"
+ )
+ )
+ self.assertEqual(augmentRecord.autoScheduleMode, "automatic")
+
+
</ins><span class="cx"> def test_resourcesXML(self):
</span><span class="cx"> """
</span><span class="cx"> Verify conversion of old resources.xml format to twext.who.xml format
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavupgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/upgrade.py (15467 => 15468)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/upgrade.py        2016-03-01 21:14:32 UTC (rev 15467)
+++ CalendarServer/trunk/twistedcaldav/upgrade.py        2016-03-01 21:17:13 UTC (rev 15468)
</span><span class="lines">@@ -1011,18 +1011,19 @@
</span><span class="cx"> "select GUID, AUTOSCHEDULE from RESOURCEINFO"
</span><span class="cx"> )
</span><span class="cx"> for uid, autoSchedule in results:
</span><del>- record = yield directory.recordWithUID(uid)
- if record is not None:
- augmentRecord = (
- yield augmentService.getAugmentRecord(
- uid,
- directory.recordTypeToOldName(record.recordType)
</del><ins>+ if uid is not None:
+ record = yield directory.recordWithUID(uid)
+ if record is not None:
+ augmentRecord = (
+ yield augmentService.getAugmentRecord(
+ uid,
+ directory.recordTypeToOldName(record.recordType)
+ )
</ins><span class="cx"> )
</span><del>- )
- augmentRecord.autoScheduleMode = (
- "automatic" if autoSchedule else "default"
- )
- augmentRecords.append(augmentRecord)
</del><ins>+ augmentRecord.autoScheduleMode = (
+ "automatic" if autoSchedule else "default"
+ )
+ augmentRecords.append(augmentRecord)
</ins><span class="cx">
</span><span class="cx"> if augmentRecords:
</span><span class="cx"> yield augmentService.addAugmentRecords(augmentRecords)
</span></span></pre>
</div>
</div>
</body>
</html>