<!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>[12284] CalendarServer/trunk/txdav/common/datastore/sql_schema</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/12284">12284</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-01-10 10:01:59 -0800 (Fri, 10 Jan 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Re-order SQL upgrades after non-sequential merge of an upgrade to -5.2-dev branch.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv28sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v28.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_schemaupgradesoracledialectupgrade_from_27_to_28sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_27_to_28.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_28_to_29sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_28_to_29.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_27_to_28sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_27_to_28.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_28_to_29sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_28_to_29.sql</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv28sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v28.sql (12283 => 12284)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v28.sql        2014-01-10 17:56:24 UTC (rev 12283)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v28.sql        2014-01-10 18:01:59 UTC (rev 12284)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">     &quot;QUOTA_USED_BYTES&quot; integer default 0 not null,
</span><span class="cx">     &quot;DEFAULT_EVENTS&quot; integer default null references CALENDAR on delete set null,
</span><span class="cx">     &quot;DEFAULT_TASKS&quot; integer default null references CALENDAR on delete set null,
</span><del>-    &quot;DEFAULT_POLLS&quot; integer default null references CALENDAR on delete set null,
</del><span class="cx">     &quot;ALARM_VEVENT_TIMED&quot; nclob default null,
</span><span class="cx">     &quot;ALARM_VEVENT_ALLDAY&quot; nclob default null,
</span><span class="cx">     &quot;ALARM_VTODO_TIMED&quot; nclob default null,
</span><span class="lines">@@ -347,7 +346,8 @@
</span><span class="cx"> create table PUSH_NOTIFICATION_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><span class="cx">     &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>-    &quot;PUSH_ID&quot; nvarchar2(255)
</del><ins>+    &quot;PUSH_ID&quot; nvarchar2(255),
+    &quot;PRIORITY&quot; integer not null
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_CACHER_POLLING_WORK (
</span><span class="lines">@@ -377,10 +377,6 @@
</span><span class="cx">     DEFAULT_TASKS
</span><span class="cx"> );
</span><span class="cx"> 
</span><del>-create index CALENDAR_HOME_METADAT_910264ce on CALENDAR_HOME_METADATA (
-    DEFAULT_POLLS
-);
-
</del><span class="cx"> create index NOTIFICATION_NOTIFICA_f891f5f9 on NOTIFICATION (
</span><span class="cx">     NOTIFICATION_HOME_RESOURCE_ID
</span><span class="cx"> );
</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 (12283 => 12284)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v28.sql        2014-01-10 17:56:24 UTC (rev 12283)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v28.sql        2014-01-10 18:01:59 UTC (rev 12284)
</span><span class="lines">@@ -74,7 +74,6 @@
</span><span class="cx">   QUOTA_USED_BYTES         integer     default 0 not null,
</span><span class="cx">   DEFAULT_EVENTS           integer     default null references CALENDAR on delete set null,
</span><span class="cx">   DEFAULT_TASKS            integer     default null references CALENDAR on delete set null,
</span><del>-  DEFAULT_POLLS            integer     default null references CALENDAR on delete set null,
</del><span class="cx">   ALARM_VEVENT_TIMED       text        default null,
</span><span class="cx">   ALARM_VEVENT_ALLDAY      text        default null,
</span><span class="cx">   ALARM_VTODO_TIMED        text        default null,
</span><span class="lines">@@ -88,8 +87,6 @@
</span><span class="cx">         CALENDAR_HOME_METADATA(DEFAULT_EVENTS);
</span><span class="cx"> create index CALENDAR_HOME_METADATA_DEFAULT_TASKS on
</span><span class="cx">         CALENDAR_HOME_METADATA(DEFAULT_TASKS);
</span><del>-create index CALENDAR_HOME_METADATA_DEFAULT_POLLS on
-        CALENDAR_HOME_METADATA(DEFAULT_POLLS);
</del><span class="cx"> 
</span><span class="cx"> -----------------------
</span><span class="cx"> -- Calendar Metadata --
</span><span class="lines">@@ -666,7 +663,8 @@
</span><span class="cx"> create table PUSH_NOTIFICATION_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><span class="cx">   NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
</span><del>-  PUSH_ID                       varchar(255) not null
</del><ins>+  PUSH_ID                       varchar(255) not null,
+  PRIORITY                      integer      not null -- 1:low 5:medium 10:high
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> -----------------
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_27_to_28sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_27_to_28.sql (12283 => 12284)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_27_to_28.sql        2014-01-10 17:56:24 UTC (rev 12283)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_27_to_28.sql        2014-01-10 18:01:59 UTC (rev 12284)
</span><span class="lines">@@ -18,16 +18,12 @@
</span><span class="cx"> -- Upgrade database schema from VERSION 27 to 28 --
</span><span class="cx"> ---------------------------------------------------
</span><span class="cx"> 
</span><del>--- Calendar home related updates
</del><ins>+-- Push notification work related updates
</ins><span class="cx"> 
</span><del>-alter table CALENDAR_HOME_METADATA
- add (&quot;DEFAULT_POLLS&quot; integer default null references CALENDAR on delete set null);
</del><ins>+alter table PUSH_NOTIFICATION_WORK
+ add (&quot;PRIORITY&quot; integer default 10 not null);
</ins><span class="cx"> 
</span><del>-create index CALENDAR_HOME_METADAT_910264ce on CALENDAR_HOME_METADATA (
-    DEFAULT_POLLS
-);
</del><ins>+update PUSH_NOTIFICATION_WORK set PRIORITY = 10;
</ins><span class="cx"> 
</span><del>-
</del><span class="cx"> -- Now update the version
</span><del>--- No data upgrades
</del><span class="cx"> update CALENDARSERVER set VALUE = '28' where NAME = 'VERSION';
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_28_to_29sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_28_to_29.sql (12283 => 12284)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_28_to_29.sql        2014-01-10 17:56:24 UTC (rev 12283)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_28_to_29.sql        2014-01-10 18:01:59 UTC (rev 12284)
</span><span class="lines">@@ -18,12 +18,16 @@
</span><span class="cx"> -- Upgrade database schema from VERSION 28 to 29 --
</span><span class="cx"> ---------------------------------------------------
</span><span class="cx"> 
</span><del>--- Push notification work related updates
</del><ins>+-- Calendar home related updates
</ins><span class="cx"> 
</span><del>-alter table PUSH_NOTIFICATION_WORK
- add (&quot;PRIORITY&quot; integer default 10 not null);
</del><ins>+alter table CALENDAR_HOME_METADATA
+ add (&quot;DEFAULT_POLLS&quot; integer default null references CALENDAR on delete set null);
</ins><span class="cx"> 
</span><del>-update PUSH_NOTIFICATION_WORK set PRIORITY = 10;
</del><ins>+create index CALENDAR_HOME_METADAT_910264ce on CALENDAR_HOME_METADATA (
+    DEFAULT_POLLS
+);
</ins><span class="cx"> 
</span><ins>+
</ins><span class="cx"> -- Now update the version
</span><ins>+-- No data upgrades
</ins><span class="cx"> update CALENDARSERVER set VALUE = '29' where NAME = 'VERSION';
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_27_to_28sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_27_to_28.sql (12283 => 12284)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_27_to_28.sql        2014-01-10 17:56:24 UTC (rev 12283)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_27_to_28.sql        2014-01-10 18:01:59 UTC (rev 12284)
</span><span class="lines">@@ -18,14 +18,12 @@
</span><span class="cx"> -- Upgrade database schema from VERSION 27 to 28 --
</span><span class="cx"> ---------------------------------------------------
</span><span class="cx"> 
</span><del>--- Calendar home related updates
</del><ins>+-- Push notification work related updates
</ins><span class="cx"> 
</span><del>-alter table CALENDAR_HOME_METADATA
- add column DEFAULT_POLLS integer default null references CALENDAR on delete set null;
</del><ins>+alter table PUSH_NOTIFICATION_WORK
+ add column PRIORITY integer default 10 not null;
</ins><span class="cx"> 
</span><del>-create index CALENDAR_HOME_METADATA_DEFAULT_POLLS on
-        CALENDAR_HOME_METADATA(DEFAULT_POLLS);
</del><ins>+update PUSH_NOTIFICATION_WORK set PRIORITY = 10;
</ins><span class="cx"> 
</span><span class="cx"> -- Now update the version
</span><del>--- No data upgrades
</del><span class="cx"> update CALENDARSERVER set VALUE = '28' where NAME = 'VERSION';
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_28_to_29sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_28_to_29.sql (12283 => 12284)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_28_to_29.sql        2014-01-10 17:56:24 UTC (rev 12283)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_28_to_29.sql        2014-01-10 18:01:59 UTC (rev 12284)
</span><span class="lines">@@ -18,12 +18,14 @@
</span><span class="cx"> -- Upgrade database schema from VERSION 28 to 29 --
</span><span class="cx"> ---------------------------------------------------
</span><span class="cx"> 
</span><del>--- Push notification work related updates
</del><ins>+-- Calendar home related updates
</ins><span class="cx"> 
</span><del>-alter table PUSH_NOTIFICATION_WORK
- add column PRIORITY integer default 10 not null;
</del><ins>+alter table CALENDAR_HOME_METADATA
+ add column DEFAULT_POLLS integer default null references CALENDAR on delete set null;
</ins><span class="cx"> 
</span><del>-update PUSH_NOTIFICATION_WORK set PRIORITY = 10;
</del><ins>+create index CALENDAR_HOME_METADATA_DEFAULT_POLLS on
+        CALENDAR_HOME_METADATA(DEFAULT_POLLS);
</ins><span class="cx"> 
</span><span class="cx"> -- Now update the version
</span><ins>+-- No data upgrades
</ins><span class="cx"> update CALENDARSERVER set VALUE = '29' where NAME = 'VERSION';
</span></span></pre>
</div>
</div>

</body>
</html>