<!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>[12800] 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/12800">12800</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-03-04 14:54:32 -0800 (Tue, 04 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix empty default alarms not set properly in an earlier upgrade.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemacurrentoracledialectsql">CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemacurrentsql">CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv28sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v28.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv29sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v29.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv30sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v30.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv31sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v31.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv32sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v32.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv33sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v33.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv34sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v34.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv35sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv36sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv28sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v28.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv29sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v29.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv30sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v30.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv31sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v31.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv32sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v32.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv33sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v33.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv34sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v34.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv35sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv36sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcommondatastoreupgradesqlupgradescalendar_upgrade_from_5_to_6py">CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_5_to_6.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreupgradesqlupgradestesttest_upgrade_from_5_to_6py">CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/test/test_upgrade_from_5_to_6.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcommondatastoresql_schemacurrentoracledialectsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -537,7 +537,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '37');
</span><del>-insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('NOTIFICATION-DATAVERSION', '1');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('MIN-VALID-REVISION', '1');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemacurrentsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -1009,7 +1009,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER values ('VERSION', '37');
</span><del>-insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER values ('NOTIFICATION-DATAVERSION', '1');
</span><span class="cx"> insert into CALENDARSERVER values ('MIN-VALID-REVISION', '1');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv28sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v28.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v28.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v28.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -367,7 +367,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '28');
</span><del>-insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> create index CALENDAR_HOME_METADAT_3cb9049e on CALENDAR_HOME_METADATA (
</span><span class="cx"> DEFAULT_EVENTS
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv29sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v29.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v29.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v29.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '29');
</span><del>-insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> create index CALENDAR_HOME_METADAT_3cb9049e on CALENDAR_HOME_METADATA (
</span><span class="cx"> DEFAULT_EVENTS
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv30sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v30.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v30.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v30.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '30');
</span><del>-insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('NOTIFICATION-DATAVERSION', '1');
</span><span class="cx"> create index CALENDAR_HOME_METADAT_3cb9049e on CALENDAR_HOME_METADATA (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv31sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v31.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v31.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v31.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '31');
</span><del>-insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('NOTIFICATION-DATAVERSION', '1');
</span><span class="cx"> create index CALENDAR_HOME_METADAT_3cb9049e on CALENDAR_HOME_METADATA (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv32sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v32.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v32.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v32.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '32');
</span><del>-insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('NOTIFICATION-DATAVERSION', '1');
</span><span class="cx"> create index CALENDAR_HOME_METADAT_3cb9049e on CALENDAR_HOME_METADATA (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv33sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v33.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v33.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v33.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '33');
</span><del>-insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('NOTIFICATION-DATAVERSION', '1');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('MIN-VALID-REVISION', '1');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv34sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v34.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v34.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v34.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -463,7 +463,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '34');
</span><del>-insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('NOTIFICATION-DATAVERSION', '1');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('MIN-VALID-REVISION', '1');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv35sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '35');
</span><del>-insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('NOTIFICATION-DATAVERSION', '1');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('MIN-VALID-REVISION', '1');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv36sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -527,7 +527,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '36');
</span><del>-insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('NOTIFICATION-DATAVERSION', '1');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('MIN-VALID-REVISION', '1');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv28sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v28.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v28.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v28.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -700,5 +700,5 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER values ('VERSION', '28');
</span><del>-insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER values ('ADDRESSBOOK-DATAVERSION', '2');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv29sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v29.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v29.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v29.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -703,5 +703,5 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER values ('VERSION', '29');
</span><del>-insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER values ('ADDRESSBOOK-DATAVERSION', '2');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv30sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v30.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v30.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v30.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -706,6 +706,6 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER values ('VERSION', '30');
</span><del>-insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER values ('NOTIFICATION-DATAVERSION', '1');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv31sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v31.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v31.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v31.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -715,6 +715,6 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER values ('VERSION', '31');
</span><del>-insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER values ('NOTIFICATION-DATAVERSION', '1');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv32sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v32.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v32.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v32.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -734,6 +734,6 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER values ('VERSION', '32');
</span><del>-insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER values ('NOTIFICATION-DATAVERSION', '1');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv33sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v33.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v33.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v33.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -752,7 +752,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER values ('VERSION', '33');
</span><del>-insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER values ('NOTIFICATION-DATAVERSION', '1');
</span><span class="cx"> insert into CALENDARSERVER values ('MIN-VALID-REVISION', '1');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv34sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v34.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v34.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v34.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -863,7 +863,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER values ('VERSION', '34');
</span><del>-insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER values ('NOTIFICATION-DATAVERSION', '1');
</span><span class="cx"> insert into CALENDARSERVER values ('MIN-VALID-REVISION', '1');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv35sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -923,7 +923,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER values ('VERSION', '35');
</span><del>-insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER values ('NOTIFICATION-DATAVERSION', '1');
</span><span class="cx"> insert into CALENDARSERVER values ('MIN-VALID-REVISION', '1');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv36sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql (12799 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql 2014-03-04 22:51:30 UTC (rev 12799)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -938,7 +938,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER values ('VERSION', '36');
</span><del>-insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '5');
</del><ins>+insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '6');
</ins><span class="cx"> insert into CALENDARSERVER values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER values ('NOTIFICATION-DATAVERSION', '1');
</span><span class="cx"> insert into CALENDARSERVER values ('MIN-VALID-REVISION', '1');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreupgradesqlupgradescalendar_upgrade_from_5_to_6py"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_5_to_6.py (0 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_5_to_6.py (rev 0)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/calendar_upgrade_from_5_to_6.py 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+# -*- test-case-name: txdav.common.datastore.upgrade.sql.test -*-
+##
+# Copyright (c) 2011-2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from twext.enterprise.dal.syntax import Update
+
+from twisted.internet.defer import inlineCallbacks
+
+from txdav.common.datastore.sql_tables import schema, _BIND_MODE_OWN
+from txdav.common.datastore.upgrade.sql.upgrades.util import updateCalendarDataVersion, \
+ updateAllCalendarHomeDataVersions
+
+"""
+Data upgrade from database version 5 to 6
+"""
+
+UPGRADE_TO_VERSION = 6
+
+@inlineCallbacks
+def doUpgrade(sqlStore):
+ """
+ Do the required upgrade steps.
+ """
+
+ sqlTxn = sqlStore.newTransaction()
+ cb = schema.CALENDAR_BIND
+ yield Update(
+ {
+ cb.ALARM_VEVENT_TIMED: "empty",
+ cb.ALARM_VEVENT_ALLDAY: "empty",
+ cb.ALARM_VTODO_TIMED: "empty",
+ cb.ALARM_VTODO_ALLDAY: "empty",
+ },
+ Where=(cb.BIND_MODE != _BIND_MODE_OWN)
+ ).on(sqlTxn)
+ yield sqlTxn.commit()
+
+ # Always bump the DB value
+ yield updateAllCalendarHomeDataVersions(sqlStore, UPGRADE_TO_VERSION)
+ yield updateCalendarDataVersion(sqlStore, UPGRADE_TO_VERSION)
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreupgradesqlupgradestesttest_upgrade_from_5_to_6py"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/test/test_upgrade_from_5_to_6.py (0 => 12800)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/test/test_upgrade_from_5_to_6.py (rev 0)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/upgrades/test/test_upgrade_from_5_to_6.py 2014-03-04 22:54:32 UTC (rev 12800)
</span><span class="lines">@@ -0,0 +1,140 @@
</span><ins>+##
+# Copyright (c) 2010-2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+"""
+Tests for L{txdav.common.datastore.upgrade.sql.upgrade}.
+"""
+
+from twisted.internet.defer import inlineCallbacks, returnValue
+
+from twext.enterprise.dal.syntax import Update
+
+from txdav.caldav.datastore.test.util import CommonStoreTests
+from txdav.common.datastore.sql_tables import _BIND_MODE_WRITE, _BIND_MODE_READ
+from txdav.common.datastore.upgrade.sql.upgrades.calendar_upgrade_from_5_to_6 import doUpgrade
+
+
+class Upgrade_from_5_to_6(CommonStoreTests):
+ """
+ Tests for L{DefaultCalendarPropertyUpgrade}.
+ """
+
+ @inlineCallbacks
+ def _upgrade_setup(self):
+
+ # Setup old properties
+ detailshome = (
+ (True, True, "boo",),
+ (True, False, "boo",),
+ (False, True, "boo",),
+ (False, False, "boo",),
+ )
+ detailscalendar = (
+ (True, True, "boo",),
+ (True, False, "boo",),
+ (False, True, "boo",),
+ (False, False, "boo",),
+ )
+ detailsshared = (
+ (True, True, "",),
+ (True, False, "boo",),
+ (False, True, "boo",),
+ (False, False, "",),
+ )
+
+ home = yield self.homeUnderTest(name="user01")
+ for vevent, timed, alarm in detailshome:
+ yield home.setDefaultAlarm(alarm, vevent, timed)
+
+ calendar = yield self.calendarUnderTest(name="calendar_1", home="user01")
+ for vevent, timed, alarm in detailscalendar:
+ yield calendar.setDefaultAlarm(alarm, vevent, timed)
+
+ home2 = yield self.homeUnderTest(name="user02")
+ shared_name2 = yield calendar.shareWith(home2, _BIND_MODE_WRITE)
+ shared = yield self.calendarUnderTest(name=shared_name2, home="user02")
+ for vevent, timed, alarm in detailsshared:
+ yield shared.setDefaultAlarm(alarm, vevent, timed)
+
+ home3 = yield self.homeUnderTest(name="user03")
+ shared_name3 = yield calendar.shareWith(home3, _BIND_MODE_READ)
+ shared = yield self.calendarUnderTest(name=shared_name3, home="user03")
+ for vevent, timed, alarm in detailsshared:
+ yield shared.setDefaultAlarm(alarm, vevent, timed)
+
+ for user in ("user01", "user02", "user03",):
+ # Force data version to previous
+ home = (yield self.homeUnderTest(name=user))
+ ch = home._homeSchema
+ yield Update(
+ {ch.DATAVERSION: 5},
+ Where=ch.RESOURCE_ID == home._resourceID,
+ ).on(self.transactionUnderTest())
+
+ yield self.commit()
+
+ # Re-adjust for empty changes
+ detailsshared = (
+ (True, True, "empty",),
+ (True, False, "empty",),
+ (False, True, "empty",),
+ (False, False, "empty",),
+ )
+
+ returnValue((detailshome, detailscalendar, detailsshared, shared_name2, shared_name3,))
+
+
+ @inlineCallbacks
+ def _upgrade_check(self, detailshome, detailscalendar, detailsshared, shared_name2, shared_name3):
+
+ # Check each type of collection
+ home = yield self.homeUnderTest(name="user01")
+ version = (yield home.dataVersion())
+ self.assertEqual(version, 6)
+ for vevent, timed, alarm in detailshome:
+ alarm_result = (yield home.getDefaultAlarm(vevent, timed))
+ self.assertEquals(alarm_result, alarm)
+
+ calendar = yield self.calendarUnderTest(name="calendar_1", home="user01")
+ for vevent, timed, alarm in detailscalendar:
+ alarm_result = (yield calendar.getDefaultAlarm(vevent, timed))
+ self.assertEquals(alarm_result, alarm)
+
+ home2 = (yield self.homeUnderTest(name="user02"))
+ version = (yield home2.dataVersion())
+ self.assertEqual(version, 6)
+ shared = yield self.calendarUnderTest(name=shared_name2, home="user02")
+ for vevent, timed, alarm in detailsshared:
+ alarm_result = (yield shared.getDefaultAlarm(vevent, timed))
+ self.assertEquals(alarm_result, alarm)
+
+ home3 = (yield self.homeUnderTest(name="user02"))
+ version = (yield home3.dataVersion())
+ self.assertEqual(version, 6)
+ shared = yield self.calendarUnderTest(name=shared_name3, home="user03")
+ for vevent, timed, alarm in detailsshared:
+ alarm_result = (yield shared.getDefaultAlarm(vevent, timed))
+ self.assertEquals(alarm_result, alarm)
+
+ version = yield self.transactionUnderTest().calendarserverValue("CALENDAR-DATAVERSION")
+ self.assertEqual(int(version), 6)
+
+
+ @inlineCallbacks
+ def test_defaultAlarmUpgrade(self):
+ detailshome, detailscalendar, detailsshared, shared_name2, shared_name3 = (yield self._upgrade_setup())
+ yield doUpgrade(self._sqlCalendarStore)
+ yield self._upgrade_check(detailshome, detailscalendar, detailsshared, shared_name2, shared_name3)
</ins></span></pre>
</div>
</div>
</body>
</html>