<!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>[15676] 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/15676">15676</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2016-06-15 15:32:47 -0700 (Wed, 15 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add index for CALENDAR_OBJECT.ORIGINAL_COLLECTION</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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_62_to_63sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_62_to_63.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_62_to_63sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_62_to_63.sql</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 (15675 => 15676)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2016-06-15 17:31:19 UTC (rev 15675)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2016-06-15 22:32:47 UTC (rev 15676)
</span><span class="lines">@@ -680,7 +680,7 @@
</span><span class="cx"> "VALUE" nvarchar2(255)
</span><span class="cx"> );
</span><span class="cx">
</span><del>-insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '62');
</del><ins>+insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '63');
</ins><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '6');
</span><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="lines">@@ -750,6 +750,10 @@
</span><span class="cx"> "DROPBOX_ID"
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+create index CALENDAR_OBJECT_ORIGI_a3d15cf2 on CALENDAR_OBJECT (
+ "ORIGINAL_COLLECTION"
+);
+
</ins><span class="cx"> create index TIME_RANGE_CALENDAR_R_beb6e7eb on TIME_RANGE (
</span><span class="cx"> "CALENDAR_RESOURCE_ID"
</span><span class="cx"> );
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemacurrentsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql (15675 => 15676)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql 2016-06-15 17:31:19 UTC (rev 15675)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql 2016-06-15 22:32:47 UTC (rev 15676)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> OWNER_UID varchar(255) not null, -- implicit index
</span><span class="cx"> STATUS integer default 0 not null, -- enum HOME_STATUS
</span><span class="cx"> DATAVERSION integer default 0 not null,
</span><del>-
</del><ins>+
</ins><span class="cx"> unique (OWNER_UID, STATUS) -- implicit index
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> REMOTE_RESOURCE_ID integer not null,
</span><span class="cx"> LOCAL_RESOURCE_ID integer references CALENDAR on delete cascade,
</span><span class="cx"> LAST_SYNC_TOKEN varchar(255),
</span><del>-
</del><ins>+
</ins><span class="cx"> primary key (CALENDAR_HOME_RESOURCE_ID, REMOTE_RESOURCE_ID) -- implicit index
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> OWNER_UID varchar(255) not null, -- implicit index
</span><span class="cx"> STATUS integer default 0 not null, -- enum HOME_STATUS
</span><span class="cx"> DATAVERSION integer default 0 not null,
</span><del>-
</del><ins>+
</ins><span class="cx"> unique (OWNER_UID, STATUS) -- implicit index
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -316,6 +316,9 @@
</span><span class="cx"> create index CALENDAR_OBJECT_DROPBOX_ID on
</span><span class="cx"> CALENDAR_OBJECT(DROPBOX_ID);
</span><span class="cx">
</span><ins>+create index CALENDAR_OBJECT_ORIGINAL_COLLECTION on
+ CALENDAR_OBJECT(ORIGINAL_COLLECTION);
+
</ins><span class="cx"> -- Enumeration of attachment modes
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJ_ATTACHMENTS_MODE (
</span><span class="lines">@@ -407,7 +410,7 @@
</span><span class="cx"> CALENDAR_HOME_RESOURCE_ID integer references CALENDAR_HOME on delete cascade,
</span><span class="cx"> REMOTE_RESOURCE_ID integer not null,
</span><span class="cx"> LOCAL_RESOURCE_ID integer references CALENDAR_OBJECT on delete cascade,
</span><del>-
</del><ins>+
</ins><span class="cx"> primary key (CALENDAR_HOME_RESOURCE_ID, REMOTE_RESOURCE_ID) -- implicit index
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -462,7 +465,7 @@
</span><span class="cx"> CALENDAR_HOME_RESOURCE_ID integer references CALENDAR_HOME on delete cascade,
</span><span class="cx"> REMOTE_RESOURCE_ID integer not null,
</span><span class="cx"> LOCAL_RESOURCE_ID integer references ATTACHMENT on delete cascade,
</span><del>-
</del><ins>+
</ins><span class="cx"> primary key (CALENDAR_HOME_RESOURCE_ID, REMOTE_RESOURCE_ID) -- implicit index
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -496,7 +499,7 @@
</span><span class="cx"> OWNER_UID varchar(255) not null,
</span><span class="cx"> STATUS integer default 0 not null, -- enum HOME_STATUS
</span><span class="cx"> DATAVERSION integer default 0 not null,
</span><del>-
</del><ins>+
</ins><span class="cx"> unique (OWNER_UID, STATUS) -- implicit index
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -1072,7 +1075,7 @@
</span><span class="cx"> JOB_ID integer references JOB not null,
</span><span class="cx"> HOME_ID integer not null references CALENDAR_HOME on delete cascade,
</span><span class="cx"> RESOURCE_NAME varchar(255) not null,
</span><del>-
</del><ins>+
</ins><span class="cx"> unique (HOME_ID, RESOURCE_NAME) -- implicit index
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -1310,7 +1313,7 @@
</span><span class="cx"> VALUE varchar(255)
</span><span class="cx"> );
</span><span class="cx">
</span><del>-insert into CALENDARSERVER values ('VERSION', '62');
</del><ins>+insert into CALENDARSERVER values ('VERSION', '63');
</ins><span class="cx"> insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '6');
</span><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_schemaupgradesoracledialectupgrade_from_62_to_63sql"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_62_to_63.sql (0 => 15676)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_62_to_63.sql (rev 0)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_62_to_63.sql 2016-06-15 22:32:47 UTC (rev 15676)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+----
+-- Copyright (c) 2012-2016 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.
+----
+
+---------------------------------------------------
+-- Upgrade database schema from VERSION 62 to 63 --
+---------------------------------------------------
+
+create index CALENDAR_OBJECT_ORIGI_a3d15cf2 on CALENDAR_OBJECT (
+ "ORIGINAL_COLLECTION"
+);
+
+-- update the version
+update CALENDARSERVER set VALUE = '63' where NAME = 'VERSION';
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_62_to_63sql"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_62_to_63.sql (0 => 15676)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_62_to_63.sql (rev 0)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_62_to_63.sql 2016-06-15 22:32:47 UTC (rev 15676)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+----
+-- Copyright (c) 2012-2016 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.
+----
+
+---------------------------------------------------
+-- Upgrade database schema from VERSION 62 to 63 --
+---------------------------------------------------
+
+create index CALENDAR_OBJECT_ORIGINAL_COLLECTION on
+ CALENDAR_OBJECT(ORIGINAL_COLLECTION);
+
+-- update the version
+update CALENDARSERVER set VALUE = '63' where NAME = 'VERSION';
</ins></span></pre>
</div>
</div>
</body>
</html>