<!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>[15313] 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/15313">15313</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-11-15 10:17:50 -0800 (Sun, 15 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Need some white space to keep sqlparse happy.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemacurrentsql">CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv10sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v10.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv11sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v11.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv12sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v12.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv13sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v13.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv14sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v14.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv15sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v15.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv16sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v16.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv17sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v17.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv18sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v18.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv19sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v19.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv20sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v20.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv21sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v21.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv22sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v22.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv23sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v23.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv24sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v24.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv25sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v25.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv26sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v26.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv27sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v27.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_schemaoldoracledialectv3sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v3.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_schemaoldoracledialectv37sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v37.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv38sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v38.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv39sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v39.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv4sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v4.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv5sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v5.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv6sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v6.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv7sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v7.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv8sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v8.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv9sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v9.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv10sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v10.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv11sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v11.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv12sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v12.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv13sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v13.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv14sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v14.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv15sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v15.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv16sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v16.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv17sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v17.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv18sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v18.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv19sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v19.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv20sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v20.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv21sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v21.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv22sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v22.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv23sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v23.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv24sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v24.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv25sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v25.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv26sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v26.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv27sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v27.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_schemaoldpostgresdialectv3sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v3.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>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv37sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v37.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv38sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v38.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv39sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v39.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv4sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v4.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv48sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v48.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv49sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v49.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv5sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v5.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv50sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v50.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv51sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v51.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv52sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v52.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv53sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v53.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv54sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v54.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv55sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v55.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv56sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v56.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv57sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v57.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv58sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v58.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv6sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v6.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv7sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v7.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv8sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v8.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv9sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v9.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_11_to_12sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_11_to_12.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_12_to_13sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_12_to_13.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_15_to_16sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_15_to_16.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_19_to_20sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_19_to_20.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_34_to_35sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_34_to_35.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_47_to_48sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_47_to_48.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_4_to_5sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_4_to_5.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_5_to_6sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_5_to_6.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_6_to_7sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_6_to_7.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_11_to_12sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_11_to_12.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_30_to_31sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_30_to_31.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_39_to_40sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_39_to_40.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_47_to_48sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_47_to_48.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_4_to_5sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_4_to_5.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_5_to_6sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_5_to_6.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_6_to_7sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_6_to_7.sql</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcommondatastoresql_schemacurrentsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -660,7 +660,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span><span class="lines">@@ -687,7 +687,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv10sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v10.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v10.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v10.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "PATH" nvarchar2(1024),
</span><del>- primary key("DROPBOX_ID", "PATH")
</del><ins>+ primary key ("DROPBOX_ID", "PATH")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -202,8 +202,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -215,8 +215,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> "RESOURCE_KEY" nvarchar2(255),
</span><span class="cx"> "MODIFIED" integer not null,
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDARSERVER (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv11sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v11.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v11.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v11.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "PATH" nvarchar2(1024),
</span><del>- primary key("DROPBOX_ID", "PATH")
</del><ins>+ primary key ("DROPBOX_ID", "PATH")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -202,8 +202,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -215,8 +215,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDARSERVER (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv12sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v12.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v12.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v12.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_HOME (
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -67,8 +67,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "PATH" nvarchar2(1024),
</span><del>- primary key("DROPBOX_ID", "PATH")
</del><ins>+ primary key ("DROPBOX_ID", "PATH")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -210,8 +210,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -223,8 +223,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDARSERVER (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv13sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v13.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v13.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v13.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_HOME (
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -68,8 +68,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -175,8 +175,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -219,8 +219,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -232,8 +232,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDARSERVER (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv14sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v14.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v14.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v14.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_HOME (
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx"> "BIND_MODE" integer not null,
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -165,8 +165,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -207,8 +207,8 @@
</span><span class="cx"> "BIND_MODE" integer not null,
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -220,8 +220,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDARSERVER (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv15sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v15.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v15.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v15.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -62,8 +62,8 @@
</span><span class="cx"> "BIND_MODE" integer not null,
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -169,8 +169,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -211,8 +211,8 @@
</span><span class="cx"> "BIND_MODE" integer not null,
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -224,8 +224,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDARSERVER (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv16sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v16.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v16.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v16.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -63,8 +63,8 @@
</span><span class="cx"> "BIND_MODE" integer not null,
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -170,8 +170,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -212,8 +212,8 @@
</span><span class="cx"> "BIND_MODE" integer not null,
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -225,8 +225,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv17sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v17.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v17.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v17.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -63,8 +63,8 @@
</span><span class="cx"> "BIND_MODE" integer not null,
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -169,8 +169,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -211,8 +211,8 @@
</span><span class="cx"> "BIND_MODE" integer not null,
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -224,8 +224,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv18sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v18.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v18.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v18.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -63,8 +63,8 @@
</span><span class="cx"> "BIND_MODE" integer not null,
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -169,8 +169,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -211,8 +211,8 @@
</span><span class="cx"> "BIND_MODE" integer not null,
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -224,8 +224,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv19sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v19.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v19.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v19.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -75,8 +75,8 @@
</span><span class="cx"> "ALARM_VEVENT_ALLDAY" nclob default null,
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -188,8 +188,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -231,8 +231,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -244,8 +244,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv20sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v20.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v20.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v20.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -75,8 +75,8 @@
</span><span class="cx"> "ALARM_VEVENT_ALLDAY" nclob default null,
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -188,8 +188,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -222,8 +222,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -236,8 +236,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -253,14 +253,14 @@
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT,
</span><del>- primary key("GROUP_ID", "MEMBER_ID")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -271,8 +271,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv21sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v21.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v21.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v21.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -75,8 +75,8 @@
</span><span class="cx"> "ALARM_VEVENT_ALLDAY" nclob default null,
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -188,8 +188,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -222,8 +222,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -236,8 +236,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -253,14 +253,14 @@
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT,
</span><del>- primary key("GROUP_ID", "MEMBER_ID")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -271,8 +271,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -298,7 +298,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv22sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v22.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v22.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v22.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -77,8 +77,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -190,8 +190,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -224,8 +224,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -238,8 +238,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -255,14 +255,14 @@
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT,
</span><del>- primary key("GROUP_ID", "MEMBER_ID")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -273,8 +273,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv23sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v23.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v23.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v23.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -77,8 +77,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -190,8 +190,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -224,8 +224,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -238,8 +238,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -255,14 +255,14 @@
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT,
</span><del>- primary key("GROUP_ID", "MEMBER_ID")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -273,8 +273,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv24sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v24.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v24.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v24.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -77,8 +77,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -190,8 +190,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -224,8 +224,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -238,8 +238,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -255,14 +255,14 @@
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT,
</span><del>- primary key("GROUP_ID", "MEMBER_ID")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -273,8 +273,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv25sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v25.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v25.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v25.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -77,8 +77,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -190,8 +190,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -224,8 +224,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -238,8 +238,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -255,14 +255,14 @@
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT,
</span><del>- primary key("GROUP_ID", "MEMBER_ID")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -273,8 +273,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv26sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v26.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v26.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v26.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -77,8 +77,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -190,8 +190,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -224,8 +224,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -238,8 +238,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -255,14 +255,14 @@
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT,
</span><del>- primary key("GROUP_ID", "MEMBER_ID")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -273,8 +273,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv27sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v27.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v27.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v27.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -77,8 +77,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -190,8 +190,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -224,8 +224,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -238,8 +238,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -255,14 +255,14 @@
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT,
</span><del>- primary key("GROUP_ID", "MEMBER_ID")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -273,8 +273,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v28.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v28.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -77,8 +77,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -190,8 +190,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -224,8 +224,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -238,8 +238,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -255,14 +255,14 @@
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT,
</span><del>- primary key("GROUP_ID", "MEMBER_ID")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -273,8 +273,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v29.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v29.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -78,8 +78,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -191,8 +191,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -225,8 +225,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -239,8 +239,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -256,14 +256,14 @@
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT,
</span><del>- primary key("GROUP_ID", "MEMBER_ID")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -274,8 +274,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv3sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v3.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v3.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v3.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -51,8 +51,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "PATH" nvarchar2(1024),
</span><del>- unique("DROPBOX_ID", "PATH")
</del><ins>+ unique ("DROPBOX_ID", "PATH")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -186,8 +186,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -199,8 +199,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_REVISIONS (
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NOTIFICATION_OBJECT_REVISIONS (
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDARSERVER (
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v30.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v30.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -79,8 +79,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -194,8 +194,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -228,8 +228,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -242,8 +242,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -259,14 +259,14 @@
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT,
</span><del>- primary key("GROUP_ID", "MEMBER_ID")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -277,8 +277,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v31.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v31.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -79,8 +79,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -194,8 +194,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -228,8 +228,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -242,8 +242,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -261,14 +261,14 @@
</span><span class="cx"> "MEMBER_ID" integer not null,
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "REMOVED" integer default 0 not null,
</span><del>- primary key("GROUP_ID", "MEMBER_ID", "REVISION")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -279,8 +279,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -326,7 +326,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v32.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v32.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -89,8 +89,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -204,8 +204,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -240,8 +240,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -254,8 +254,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -273,14 +273,14 @@
</span><span class="cx"> "MEMBER_ID" integer not null,
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "REMOVED" integer default 0 not null,
</span><del>- primary key("GROUP_ID", "MEMBER_ID", "REVISION")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -292,8 +292,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v33.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v33.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -89,8 +89,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -204,8 +204,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -240,8 +240,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -254,8 +254,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -274,14 +274,14 @@
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "REMOVED" integer default 0 not null,
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("GROUP_ID", "MEMBER_ID", "REVISION")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -293,8 +293,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v34.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v34.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -89,8 +89,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -204,8 +204,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -240,8 +240,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -254,8 +254,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -274,14 +274,14 @@
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "REMOVED" integer default 0 not null,
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("GROUP_ID", "MEMBER_ID", "REVISION")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -293,8 +293,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -89,8 +89,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -204,8 +204,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -240,8 +240,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -254,8 +254,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -274,14 +274,14 @@
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "REMOVED" integer default 0 not null,
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("GROUP_ID", "MEMBER_ID", "REVISION")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -293,8 +293,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span><span class="lines">@@ -417,7 +417,7 @@
</span><span class="cx"> "DELEGATOR" nvarchar2(255),
</span><span class="cx"> "DELEGATE" nvarchar2(255),
</span><span class="cx"> "READ_WRITE" integer not null,
</span><del>- primary key("DELEGATOR", "READ_WRITE", "DELEGATE")
</del><ins>+ primary key ("DELEGATOR", "READ_WRITE", "DELEGATE")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table DELEGATE_GROUPS (
</span><span class="lines">@@ -425,7 +425,7 @@
</span><span class="cx"> "GROUP_ID" integer not null,
</span><span class="cx"> "READ_WRITE" integer not null,
</span><span class="cx"> "IS_EXTERNAL" integer not null,
</span><del>- primary key("DELEGATOR", "READ_WRITE", "GROUP_ID")
</del><ins>+ primary key ("DELEGATOR", "READ_WRITE", "GROUP_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table EXTERNAL_DELEGATE_GROUPS (
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -89,8 +89,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -204,8 +204,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -240,8 +240,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -254,8 +254,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -274,14 +274,14 @@
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "REMOVED" integer default 0 not null,
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("GROUP_ID", "MEMBER_ID", "REVISION")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -293,8 +293,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span><span class="lines">@@ -417,7 +417,7 @@
</span><span class="cx"> "DELEGATOR" nvarchar2(255),
</span><span class="cx"> "DELEGATE" nvarchar2(255),
</span><span class="cx"> "READ_WRITE" integer not null,
</span><del>- primary key("DELEGATOR", "READ_WRITE", "DELEGATE")
</del><ins>+ primary key ("DELEGATOR", "READ_WRITE", "DELEGATE")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table DELEGATE_GROUPS (
</span><span class="lines">@@ -425,7 +425,7 @@
</span><span class="cx"> "GROUP_ID" integer not null,
</span><span class="cx"> "READ_WRITE" integer not null,
</span><span class="cx"> "IS_EXTERNAL" integer not null,
</span><del>- primary key("DELEGATOR", "READ_WRITE", "GROUP_ID")
</del><ins>+ primary key ("DELEGATOR", "READ_WRITE", "GROUP_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table EXTERNAL_DELEGATE_GROUPS (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv37sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v37.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v37.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v37.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -99,8 +99,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -214,8 +214,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -250,8 +250,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -264,8 +264,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -284,14 +284,14 @@
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "REMOVED" integer default 0 not null,
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("GROUP_ID", "MEMBER_ID", "REVISION")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -303,8 +303,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -344,7 +344,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span><span class="lines">@@ -427,7 +427,7 @@
</span><span class="cx"> "DELEGATOR" nvarchar2(255),
</span><span class="cx"> "DELEGATE" nvarchar2(255),
</span><span class="cx"> "READ_WRITE" integer not null,
</span><del>- primary key("DELEGATOR", "READ_WRITE", "DELEGATE")
</del><ins>+ primary key ("DELEGATOR", "READ_WRITE", "DELEGATE")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table DELEGATE_GROUPS (
</span><span class="lines">@@ -435,7 +435,7 @@
</span><span class="cx"> "GROUP_ID" integer not null,
</span><span class="cx"> "READ_WRITE" integer not null,
</span><span class="cx"> "IS_EXTERNAL" integer not null,
</span><del>- primary key("DELEGATOR", "READ_WRITE", "GROUP_ID")
</del><ins>+ primary key ("DELEGATOR", "READ_WRITE", "GROUP_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table EXTERNAL_DELEGATE_GROUPS (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv38sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v38.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v38.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v38.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -99,8 +99,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -216,8 +216,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -252,8 +252,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -266,8 +266,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -286,14 +286,14 @@
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "REMOVED" integer default 0 not null,
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("GROUP_ID", "MEMBER_ID", "REVISION")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -305,8 +305,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -346,7 +346,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> "DELEGATOR" nvarchar2(255),
</span><span class="cx"> "DELEGATE" nvarchar2(255),
</span><span class="cx"> "READ_WRITE" integer not null,
</span><del>- primary key("DELEGATOR", "READ_WRITE", "DELEGATE")
</del><ins>+ primary key ("DELEGATOR", "READ_WRITE", "DELEGATE")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table DELEGATE_GROUPS (
</span><span class="lines">@@ -437,7 +437,7 @@
</span><span class="cx"> "GROUP_ID" integer not null,
</span><span class="cx"> "READ_WRITE" integer not null,
</span><span class="cx"> "IS_EXTERNAL" integer not null,
</span><del>- primary key("DELEGATOR", "READ_WRITE", "GROUP_ID")
</del><ins>+ primary key ("DELEGATOR", "READ_WRITE", "GROUP_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table EXTERNAL_DELEGATE_GROUPS (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv39sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v39.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v39.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v39.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NAMED_LOCK (
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -99,8 +99,8 @@
</span><span class="cx"> "ALARM_VTODO_TIMED" nclob default null,
</span><span class="cx"> "ALARM_VTODO_ALLDAY" nclob default null,
</span><span class="cx"> "TIMEZONE" nclob default null,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -216,8 +216,8 @@
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span><span class="cx"> "MANAGED_ID" nvarchar2(255),
</span><span class="cx"> "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
</span><del>- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
- unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</del><ins>+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -252,8 +252,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -266,8 +266,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_KIND (
</span><span class="lines">@@ -286,14 +286,14 @@
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "REMOVED" integer default 0 not null,
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("GROUP_ID", "MEMBER_ID", "REVISION")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><span class="lines">@@ -305,8 +305,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -336,7 +336,7 @@
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -346,7 +346,7 @@
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><span class="cx"> "USER_AGENT" nvarchar2(255) default null,
</span><span class="cx"> "IP_ADDR" nvarchar2(255) default null,
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_TOKENS (
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> "DELEGATOR" nvarchar2(255),
</span><span class="cx"> "DELEGATE" nvarchar2(255),
</span><span class="cx"> "READ_WRITE" integer not null,
</span><del>- primary key("DELEGATOR", "READ_WRITE", "DELEGATE")
</del><ins>+ primary key ("DELEGATOR", "READ_WRITE", "DELEGATE")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table DELEGATE_GROUPS (
</span><span class="lines">@@ -437,7 +437,7 @@
</span><span class="cx"> "GROUP_ID" integer not null references GROUPS on delete cascade,
</span><span class="cx"> "READ_WRITE" integer not null,
</span><span class="cx"> "IS_EXTERNAL" integer not null,
</span><del>- primary key("DELEGATOR", "READ_WRITE", "GROUP_ID")
</del><ins>+ primary key ("DELEGATOR", "READ_WRITE", "GROUP_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table EXTERNAL_DELEGATE_GROUPS (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv4sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v4.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v4.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v4.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -51,8 +51,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "PATH" nvarchar2(1024),
</span><del>- unique("DROPBOX_ID", "PATH")
</del><ins>+ unique ("DROPBOX_ID", "PATH")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -186,8 +186,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -199,8 +199,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_REVISIONS (
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table NOTIFICATION_OBJECT_REVISIONS (
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDARSERVER (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv5sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v5.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v5.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v5.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -51,8 +51,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "PATH" nvarchar2(1024),
</span><del>- primary key("DROPBOX_ID", "PATH")
</del><ins>+ primary key ("DROPBOX_ID", "PATH")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -186,8 +186,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -199,8 +199,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDARSERVER (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv6sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v6.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v6.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v6.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -51,8 +51,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "PATH" nvarchar2(1024),
</span><del>- primary key("DROPBOX_ID", "PATH")
</del><ins>+ primary key ("DROPBOX_ID", "PATH")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -186,8 +186,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -199,8 +199,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> "RESOURCE_KEY" nvarchar2(255),
</span><span class="cx"> "MODIFIED" integer not null,
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><del>- unique("TOKEN", "RESOURCE_KEY")
</del><ins>+ unique ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDARSERVER (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv7sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v7.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v7.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v7.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -55,8 +55,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "PATH" nvarchar2(1024),
</span><del>- primary key("DROPBOX_ID", "PATH")
</del><ins>+ primary key ("DROPBOX_ID", "PATH")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -193,8 +193,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -206,8 +206,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> "RESOURCE_KEY" nvarchar2(255),
</span><span class="cx"> "MODIFIED" integer not null,
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDARSERVER (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv8sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v8.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v8.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v8.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "PATH" nvarchar2(1024),
</span><del>- primary key("DROPBOX_ID", "PATH")
</del><ins>+ primary key ("DROPBOX_ID", "PATH")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -201,8 +201,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -214,8 +214,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> "RESOURCE_KEY" nvarchar2(255),
</span><span class="cx"> "MODIFIED" integer not null,
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDARSERVER (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv9sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v9.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v9.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v9.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</del><ins>+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
- unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</del><ins>+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_BIND_MODE (
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_ATTACHMENTS_MO (
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "PATH" nvarchar2(1024),
</span><del>- primary key("DROPBOX_ID", "PATH")
</del><ins>+ primary key ("DROPBOX_ID", "PATH")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table RESOURCE_PROPERTY (
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> "NAME" nvarchar2(255),
</span><span class="cx"> "VALUE" nclob,
</span><span class="cx"> "VIEWER_UID" nvarchar2(255),
</span><del>- primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
</del><ins>+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><span class="lines">@@ -201,8 +201,8 @@
</span><span class="cx"> "SEEN_BY_OWNER" integer not null,
</span><span class="cx"> "SEEN_BY_SHAREE" integer not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><span class="lines">@@ -214,8 +214,8 @@
</span><span class="cx"> "MD5" nchar(32),
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="cx"> "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
- unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</del><ins>+ unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDAR_OBJECT_REVISIONS (
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> "RESOURCE_NAME" nvarchar2(255),
</span><span class="cx"> "REVISION" integer not null,
</span><span class="cx"> "DELETED" integer not null,
</span><del>- unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</del><ins>+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table APN_SUBSCRIPTIONS (
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> "RESOURCE_KEY" nvarchar2(255),
</span><span class="cx"> "MODIFIED" integer not null,
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><del>- primary key("TOKEN", "RESOURCE_KEY")
</del><ins>+ primary key ("TOKEN", "RESOURCE_KEY")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table CALENDARSERVER (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv10sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v10.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v10.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v10.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -128,8 +128,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -185,13 +185,13 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx">
</span><span class="cx"> -- since the 'inbox' is a 'calendar resource' for the purpose of storing
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> PATH varchar(1024) not null,
</span><span class="cx">
</span><del>- primary key(DROPBOX_ID, PATH) --implicit index
</del><ins>+ primary key (DROPBOX_ID, PATH) --implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> VALUE text not null, -- FIXME: xml?
</span><span class="cx"> VIEWER_UID varchar(255),
</span><span class="cx">
</span><del>- primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
</del><ins>+ primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -381,8 +381,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text, -- FIXME: xml?
</span><span class="cx">
</span><del>- primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
- unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_BIND_RESOURCE_ID on
</span><span class="lines">@@ -398,8 +398,8 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
- unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+ unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> ---------------
</span><span class="lines">@@ -463,7 +463,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span><span class="lines">@@ -479,7 +479,7 @@
</span><span class="cx"> MODIFIED integer not null,
</span><span class="cx"> SUBSCRIBER_GUID varchar(255) not null,
</span><span class="cx">
</span><del>- primary key(TOKEN, RESOURCE_KEY) -- implicit index
</del><ins>+ primary key (TOKEN, RESOURCE_KEY) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index APN_SUBSCRIPTIONS_RESOURCE_KEY
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv11sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v11.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v11.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v11.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -128,8 +128,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -185,13 +185,13 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx">
</span><span class="cx"> -- since the 'inbox' is a 'calendar resource' for the purpose of storing
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> PATH varchar(1024) not null,
</span><span class="cx">
</span><del>- primary key(DROPBOX_ID, PATH) --implicit index
</del><ins>+ primary key (DROPBOX_ID, PATH) --implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> VALUE text not null, -- FIXME: xml?
</span><span class="cx"> VIEWER_UID varchar(255),
</span><span class="cx">
</span><del>- primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
</del><ins>+ primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -381,8 +381,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text, -- FIXME: xml?
</span><span class="cx">
</span><del>- primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
- unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_BIND_RESOURCE_ID on
</span><span class="lines">@@ -398,8 +398,8 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
- unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+ unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> ---------------
</span><span class="lines">@@ -463,7 +463,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span><span class="lines">@@ -481,7 +481,7 @@
</span><span class="cx"> USER_AGENT varchar(255) default null,
</span><span class="cx"> IP_ADDR varchar(255) default null,
</span><span class="cx">
</span><del>- primary key(TOKEN, RESOURCE_KEY) -- implicit index
</del><ins>+ primary key (TOKEN, RESOURCE_KEY) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index APN_SUBSCRIPTIONS_RESOURCE_KEY
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv12sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v12.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v12.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v12.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> PORT integer not null,
</span><span class="cx"> TIME timestamp not null default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- primary key(HOSTNAME, PORT)
</del><ins>+ primary key (HOSTNAME, PORT)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -144,8 +144,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -201,13 +201,13 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx">
</span><span class="cx"> -- since the 'inbox' is a 'calendar resource' for the purpose of storing
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> PATH varchar(1024) not null,
</span><span class="cx">
</span><del>- primary key(DROPBOX_ID, PATH) --implicit index
</del><ins>+ primary key (DROPBOX_ID, PATH) --implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> VALUE text not null, -- FIXME: xml?
</span><span class="cx"> VIEWER_UID varchar(255),
</span><span class="cx">
</span><del>- primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
</del><ins>+ primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -397,8 +397,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text, -- FIXME: xml?
</span><span class="cx">
</span><del>- primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
- unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_BIND_RESOURCE_ID on
</span><span class="lines">@@ -414,8 +414,8 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
- unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+ unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> ---------------
</span><span class="lines">@@ -479,7 +479,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span><span class="lines">@@ -497,7 +497,7 @@
</span><span class="cx"> USER_AGENT varchar(255) default null,
</span><span class="cx"> IP_ADDR varchar(255) default null,
</span><span class="cx">
</span><del>- primary key(TOKEN, RESOURCE_KEY) -- implicit index
</del><ins>+ primary key (TOKEN, RESOURCE_KEY) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index APN_SUBSCRIPTIONS_RESOURCE_KEY
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv13sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v13.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v13.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v13.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -144,8 +144,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -492,7 +492,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv14sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v14.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v14.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v14.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -120,8 +120,8 @@
</span><span class="cx"> BIND_STATUS integer not null, -- enum CALENDAR_BIND_STATUS
</span><span class="cx"> MESSAGE text,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -462,7 +462,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv15sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v15.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v15.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v15.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -126,8 +126,8 @@
</span><span class="cx"> BIND_STATUS integer not null, -- enum CALENDAR_BIND_STATUS
</span><span class="cx"> MESSAGE text,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv16sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v16.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v16.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v16.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -126,8 +126,8 @@
</span><span class="cx"> BIND_STATUS integer not null, -- enum CALENDAR_BIND_STATUS
</span><span class="cx"> MESSAGE text,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv17sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v17.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v17.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v17.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -126,8 +126,8 @@
</span><span class="cx"> BIND_STATUS integer not null, -- enum CALENDAR_BIND_STATUS
</span><span class="cx"> MESSAGE text,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv18sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v18.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v18.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v18.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -126,8 +126,8 @@
</span><span class="cx"> BIND_STATUS integer not null, -- enum CALENDAR_BIND_STATUS
</span><span class="cx"> MESSAGE text,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv19sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v19.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v19.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v19.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -138,8 +138,8 @@
</span><span class="cx"> ALARM_VTODO_TIMED text default null,
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -491,7 +491,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv20sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v20.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v20.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v20.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -141,8 +141,8 @@
</span><span class="cx"> ALARM_VTODO_TIMED text default null,
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -544,7 +544,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv21sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v21.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v21.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v21.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -141,8 +141,8 @@
</span><span class="cx"> ALARM_VTODO_TIMED text default null,
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -214,7 +214,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -544,7 +544,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv22sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v22.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v22.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v22.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -143,8 +143,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -546,7 +546,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv23sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v23.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v23.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v23.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -143,8 +143,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -551,7 +551,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv24sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v24.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v24.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v24.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -147,8 +147,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -566,7 +566,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv25sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v25.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v25.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v25.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -147,8 +147,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -566,7 +566,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv26sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v26.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v26.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v26.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -147,8 +147,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -566,7 +566,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv27sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v27.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v27.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v27.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -147,8 +147,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -569,7 +569,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v28.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v28.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -147,8 +147,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -569,7 +569,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v29.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v29.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -150,8 +150,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -572,7 +572,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv3sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v3.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v3.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v3.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID)
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -123,8 +123,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID),
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID),
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_HOME_RESOURCE_ID on
</span><span class="lines">@@ -182,13 +182,13 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME)
</del><ins>+ unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME)
</ins><span class="cx">
</span><span class="cx"> -- since the 'inbox' is a 'calendar resource' for the purpose of storing
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID on
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> PATH varchar(1024) not null,
</span><span class="cx">
</span><del>- unique(DROPBOX_ID, PATH)
</del><ins>+ unique (DROPBOX_ID, PATH)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ATTACHMENT_DROPBOX_ID on ATTACHMENT(DROPBOX_ID);
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> VALUE text not null, -- FIXME: xml?
</span><span class="cx"> VIEWER_UID varchar(255),
</span><span class="cx">
</span><del>- primary key(RESOURCE_ID, NAME, VIEWER_UID)
</del><ins>+ primary key (RESOURCE_ID, NAME, VIEWER_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -374,8 +374,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text, -- FIXME: xml?
</span><span class="cx">
</span><del>- primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID),
- unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)
</del><ins>+ primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID),
+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_BIND_HOME_RESOURCE_ID on
</span><span class="lines">@@ -393,8 +393,8 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME),
- unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID)
</del><ins>+ unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME),
+ unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_ADDRESSBOOK_RESOURCE_ID on
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME)
</del><ins>+ unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -442,7 +442,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME)
</del><ins>+ unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_REVISIONS_HOME_RESOURCE_ID
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME)
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -476,7 +476,7 @@
</span><span class="cx"> create table CALENDARSERVER (
</span><span class="cx"> NAME varchar(255),
</span><span class="cx"> VALUE varchar(255),
</span><del>- unique(NAME)
</del><ins>+ unique (NAME)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER values ('VERSION', '3');
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v30.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v30.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -151,8 +151,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v31.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v31.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -151,8 +151,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -584,7 +584,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v32.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v32.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -167,8 +167,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -603,7 +603,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v33.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v33.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -167,8 +167,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v34.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v34.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -167,8 +167,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -167,8 +167,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</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 (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -167,8 +167,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -607,7 +607,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv37sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v37.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v37.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v37.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -191,8 +191,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -631,7 +631,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv38sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v38.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v38.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v38.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -191,8 +191,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -633,7 +633,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv39sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v39.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v39.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v39.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -191,8 +191,8 @@
</span><span class="cx"> ALARM_VTODO_ALLDAY text default null,
</span><span class="cx"> TIMEZONE text default null,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -633,7 +633,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv4sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v4.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v4.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v4.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID)
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -123,8 +123,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID),
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID),
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_HOME_RESOURCE_ID on
</span><span class="lines">@@ -182,13 +182,13 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME)
</del><ins>+ unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME)
</ins><span class="cx">
</span><span class="cx"> -- since the 'inbox' is a 'calendar resource' for the purpose of storing
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID on
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> PATH varchar(1024) not null,
</span><span class="cx">
</span><del>- unique(DROPBOX_ID, PATH)
</del><ins>+ unique (DROPBOX_ID, PATH)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ATTACHMENT_DROPBOX_ID on ATTACHMENT(DROPBOX_ID);
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> VALUE text not null, -- FIXME: xml?
</span><span class="cx"> VIEWER_UID varchar(255),
</span><span class="cx">
</span><del>- primary key(RESOURCE_ID, NAME, VIEWER_UID)
</del><ins>+ primary key (RESOURCE_ID, NAME, VIEWER_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -374,8 +374,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text, -- FIXME: xml?
</span><span class="cx">
</span><del>- primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID),
- unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)
</del><ins>+ primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID),
+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_BIND_HOME_RESOURCE_ID on
</span><span class="lines">@@ -393,8 +393,8 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME),
- unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID)
</del><ins>+ unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME),
+ unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_ADDRESSBOOK_RESOURCE_ID on
</span><span class="lines">@@ -419,7 +419,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME)
</del><ins>+ unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -442,7 +442,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME)
</del><ins>+ unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_REVISIONS_HOME_RESOURCE_ID
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME)
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -476,7 +476,7 @@
</span><span class="cx"> create table CALENDARSERVER (
</span><span class="cx"> NAME varchar(255),
</span><span class="cx"> VALUE varchar(255),
</span><del>- unique(NAME)
</del><ins>+ unique (NAME)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> insert into CALENDARSERVER values ('VERSION', '4');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv48sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v48.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v48.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v48.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -584,7 +584,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span><span class="lines">@@ -608,7 +608,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv49sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v49.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v49.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v49.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -584,7 +584,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span><span class="lines">@@ -611,7 +611,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv5sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v5.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v5.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v5.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -115,8 +115,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -171,13 +171,13 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx">
</span><span class="cx"> -- since the 'inbox' is a 'calendar resource' for the purpose of storing
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> PATH varchar(1024) not null,
</span><span class="cx">
</span><del>- primary key(DROPBOX_ID, PATH) --implicit index
</del><ins>+ primary key (DROPBOX_ID, PATH) --implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> VALUE text not null, -- FIXME: xml?
</span><span class="cx"> VIEWER_UID varchar(255),
</span><span class="cx">
</span><del>- primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
</del><ins>+ primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -355,8 +355,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text, -- FIXME: xml?
</span><span class="cx">
</span><del>- primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
- unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_BIND_RESOURCE_ID on
</span><span class="lines">@@ -372,8 +372,8 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
- unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+ unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> ---------------
</span><span class="lines">@@ -431,7 +431,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv50sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v50.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v50.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v50.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -584,7 +584,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span><span class="lines">@@ -611,7 +611,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv51sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v51.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v51.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v51.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -584,7 +584,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span><span class="lines">@@ -611,7 +611,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv52sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v52.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v52.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v52.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -584,7 +584,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span><span class="lines">@@ -611,7 +611,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv53sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v53.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v53.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v53.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -645,7 +645,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span><span class="lines">@@ -672,7 +672,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv54sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v54.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v54.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v54.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -666,7 +666,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span><span class="lines">@@ -693,7 +693,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv55sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v55.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v55.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v55.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -667,7 +667,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span><span class="lines">@@ -694,7 +694,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv56sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v56.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v56.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v56.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -667,7 +667,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span><span class="lines">@@ -694,7 +694,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv57sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v57.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v57.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v57.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -667,7 +667,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span><span class="lines">@@ -694,7 +694,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv58sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v58.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v58.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v58.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span><span class="lines">@@ -678,7 +678,7 @@
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv6sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v6.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v6.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v6.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -115,8 +115,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -171,13 +171,13 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx">
</span><span class="cx"> -- since the 'inbox' is a 'calendar resource' for the purpose of storing
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> PATH varchar(1024) not null,
</span><span class="cx">
</span><del>- primary key(DROPBOX_ID, PATH) --implicit index
</del><ins>+ primary key (DROPBOX_ID, PATH) --implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> VALUE text not null, -- FIXME: xml?
</span><span class="cx"> VIEWER_UID varchar(255),
</span><span class="cx">
</span><del>- primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
</del><ins>+ primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -355,8 +355,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text, -- FIXME: xml?
</span><span class="cx">
</span><del>- primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
- unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_BIND_RESOURCE_ID on
</span><span class="lines">@@ -372,8 +372,8 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
- unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+ unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> ---------------
</span><span class="lines">@@ -431,7 +431,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> RESOURCE_KEY varchar(255) not null,
</span><span class="cx"> MODIFIED integer not null,
</span><span class="cx"> SUBSCRIBER_GUID varchar(255) not null,
</span><del>- unique(TOKEN, RESOURCE_KEY) -- implicit index
</del><ins>+ unique (TOKEN, RESOURCE_KEY) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index APN_SUBSCRIPTIONS_RESOURCE_KEY
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv7sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v7.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v7.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v7.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -119,8 +119,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -175,13 +175,13 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx">
</span><span class="cx"> -- since the 'inbox' is a 'calendar resource' for the purpose of storing
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> PATH varchar(1024) not null,
</span><span class="cx">
</span><del>- primary key(DROPBOX_ID, PATH) --implicit index
</del><ins>+ primary key (DROPBOX_ID, PATH) --implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx"> VALUE text not null, -- FIXME: xml?
</span><span class="cx"> VIEWER_UID varchar(255),
</span><span class="cx">
</span><del>- primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
</del><ins>+ primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -362,8 +362,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text, -- FIXME: xml?
</span><span class="cx">
</span><del>- primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
- unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_BIND_RESOURCE_ID on
</span><span class="lines">@@ -379,8 +379,8 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
- unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+ unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> ---------------
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span><span class="lines">@@ -460,7 +460,7 @@
</span><span class="cx"> MODIFIED integer not null,
</span><span class="cx"> SUBSCRIBER_GUID varchar(255) not null,
</span><span class="cx">
</span><del>- primary key(TOKEN, RESOURCE_KEY) -- implicit index
</del><ins>+ primary key (TOKEN, RESOURCE_KEY) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index APN_SUBSCRIPTIONS_RESOURCE_KEY
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv8sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v8.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v8.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v8.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -128,8 +128,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -184,13 +184,13 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx">
</span><span class="cx"> -- since the 'inbox' is a 'calendar resource' for the purpose of storing
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> PATH varchar(1024) not null,
</span><span class="cx">
</span><del>- primary key(DROPBOX_ID, PATH) --implicit index
</del><ins>+ primary key (DROPBOX_ID, PATH) --implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
</span><span class="lines">@@ -315,7 +315,7 @@
</span><span class="cx"> VALUE text not null, -- FIXME: xml?
</span><span class="cx"> VIEWER_UID varchar(255),
</span><span class="cx">
</span><del>- primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
</del><ins>+ primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -380,8 +380,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text, -- FIXME: xml?
</span><span class="cx">
</span><del>- primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
- unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_BIND_RESOURCE_ID on
</span><span class="lines">@@ -397,8 +397,8 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
- unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+ unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> ---------------
</span><span class="lines">@@ -462,7 +462,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx"> MODIFIED integer not null,
</span><span class="cx"> SUBSCRIBER_GUID varchar(255) not null,
</span><span class="cx">
</span><del>- primary key(TOKEN, RESOURCE_KEY) -- implicit index
</del><ins>+ primary key (TOKEN, RESOURCE_KEY) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index APN_SUBSCRIPTIONS_RESOURCE_KEY
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv9sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v9.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v9.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v9.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</del><ins>+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><span class="lines">@@ -128,8 +128,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text,
</span><span class="cx">
</span><del>- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</span><span class="lines">@@ -184,13 +184,13 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx">
</span><span class="cx"> -- since the 'inbox' is a 'calendar resource' for the purpose of storing
</span><span class="cx"> -- calendar objects, this constraint has to be selectively enforced by the
</span><span class="cx"> -- application layer.
</span><span class="cx">
</span><del>- -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</del><ins>+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> PATH varchar(1024) not null,
</span><span class="cx">
</span><del>- primary key(DROPBOX_ID, PATH) --implicit index
</del><ins>+ primary key (DROPBOX_ID, PATH) --implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
</span><span class="lines">@@ -315,7 +315,7 @@
</span><span class="cx"> VALUE text not null, -- FIXME: xml?
</span><span class="cx"> VIEWER_UID varchar(255),
</span><span class="cx">
</span><del>- primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
</del><ins>+ primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -380,8 +380,8 @@
</span><span class="cx"> SEEN_BY_SHAREE boolean not null,
</span><span class="cx"> MESSAGE text, -- FIXME: xml?
</span><span class="cx">
</span><del>- primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
- unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
</del><ins>+ primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index ADDRESSBOOK_BIND_RESOURCE_ID on
</span><span class="lines">@@ -397,8 +397,8 @@
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx">
</span><del>- unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
- unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
</del><ins>+ unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+ unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> ---------------
</span><span class="lines">@@ -462,7 +462,7 @@
</span><span class="cx"> REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> DELETED boolean not null,
</span><span class="cx">
</span><del>- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</del><ins>+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx"> MODIFIED integer not null,
</span><span class="cx"> SUBSCRIBER_GUID varchar(255) not null,
</span><span class="cx">
</span><del>- primary key(TOKEN, RESOURCE_KEY) -- implicit index
</del><ins>+ primary key (TOKEN, RESOURCE_KEY) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index APN_SUBSCRIPTIONS_RESOURCE_KEY
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_11_to_12sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_11_to_12.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_11_to_12.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_11_to_12.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> "PID" integer not null,
</span><span class="cx"> "PORT" integer not null,
</span><span class="cx"> "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</span><del>- primary key("HOSTNAME", "PORT")
</del><ins>+ primary key ("HOSTNAME", "PORT")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> -- Now update the version
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_12_to_13sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_12_to_13.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_12_to_13.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_12_to_13.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> -- now set ATTACHMENT_ID as primary key, which implies unique and not null
</span><span class="cx"> alter table ATTACHMENT
</span><del>- add primary key(ATTACHMENT_ID);
</del><ins>+ add primary key (ATTACHMENT_ID);
</ins><span class="cx">
</span><span class="cx"> create table ATTACHMENT_CALENDAR_OBJECT (
</span><span class="cx"> "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_15_to_16sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_15_to_16.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_15_to_16.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_15_to_16.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> "ATTENDEE" nvarchar2(255),
</span><span class="cx"> "ICALUID" nvarchar2(255),
</span><span class="cx"> "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>- primary key("ORGANIZER", "ATTENDEE", "ICALUID")
</del><ins>+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index IMIP_TOKENS_TOKEN_e94b918f on IMIP_TOKENS (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_19_to_20sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_19_to_20.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_19_to_20.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_19_to_20.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index SHARED_ADDRESSBOOK_BI_e9a2e6d4 on SHARED_ADDRESSBOOK_BIND (
</span><span class="lines">@@ -60,8 +60,8 @@
</span><span class="cx"> "BIND_STATUS" integer not null,
</span><span class="cx"> "BIND_REVISION" integer default 0 not null,
</span><span class="cx"> "MESSAGE" nclob,
</span><del>- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</del><ins>+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index SHARED_GROUP_BIND_RES_cf52f95d on SHARED_GROUP_BIND (
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT,
</span><del>- primary key("GROUP_ID", "MEMBER_ID")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx"> "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx"> "MEMBER_ADDRESS" nvarchar2(255),
</span><del>- primary key("GROUP_ID", "MEMBER_ADDRESS")
</del><ins>+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_34_to_35sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_34_to_35.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_34_to_35.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_34_to_35.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> "DELEGATOR" nvarchar2(255),
</span><span class="cx"> "DELEGATE" nvarchar2(255),
</span><span class="cx"> "READ_WRITE" integer not null,
</span><del>- primary key("DELEGATOR", "READ_WRITE", "DELEGATE")
</del><ins>+ primary key ("DELEGATOR", "READ_WRITE", "DELEGATE")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table DELEGATE_GROUPS (
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> "GROUP_ID" integer not null,
</span><span class="cx"> "READ_WRITE" integer not null,
</span><span class="cx"> "IS_EXTERNAL" integer not null,
</span><del>- primary key("DELEGATOR", "READ_WRITE", "GROUP_ID")
</del><ins>+ primary key ("DELEGATOR", "READ_WRITE", "GROUP_ID")
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create table EXTERNAL_DELEGATE_GROUPS (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_47_to_48sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_47_to_48.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_47_to_48.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_47_to_48.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> drop index PERUSER_TIME_RANGE_IN_5468a226;
</span><span class="cx">
</span><span class="cx"> -- Add unique to CALENDAR_OBJECT_REVISIONS and remove old index
</span><del>-alter table CALENDAR_OBJECT_REVISIONS add unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME);
</del><ins>+alter table CALENDAR_OBJECT_REVISIONS add unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME);
</ins><span class="cx"> drop index CALENDAR_OBJECT_REVIS_3a3956c4;
</span><span class="cx">
</span><span class="cx"> -- Add unique to ADDRESSBOOK_OBJECT_REVISIONS and remove old index
</span><del>-alter table ADDRESSBOOK_OBJECT_REVISIONS add unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME);
</del><ins>+alter table ADDRESSBOOK_OBJECT_REVISIONS add unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME);
</ins><span class="cx"> drop index ADDRESSBOOK_OBJECT_RE_2bfcf757;
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_4_to_5sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_4_to_5.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_4_to_5.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_4_to_5.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">
</span><span class="cx"> drop index CALENDAR_HOME_METADAT_35a84eec;
</span><span class="cx"> alter table CALENDAR_HOME_METADATA
</span><del>- add primary key(RESOURCE_ID);
</del><ins>+ add primary key (RESOURCE_ID);
</ins><span class="cx">
</span><span class="cx"> --invalid drop index INVITE_RESOURCE_ID_b36ddc23;
</span><span class="cx"> create index INVITE_RESOURCE_ID_b36ddc23 on INVITE(RESOURCE_ID);
</span><span class="lines">@@ -43,16 +43,16 @@
</span><span class="cx"> drop index ATTACHMENT_DROPBOX_ID_5073cf23;
</span><span class="cx">
</span><span class="cx"> alter table ATTACHMENT
</span><del>- drop unique(DROPBOX_ID, PATH);
</del><ins>+ drop unique (DROPBOX_ID, PATH);
</ins><span class="cx"> alter table ATTACHMENT
</span><del>- add primary key(DROPBOX_ID, PATH);
</del><ins>+ add primary key (DROPBOX_ID, PATH);
</ins><span class="cx">
</span><span class="cx"> create index ATTACHMENT_CALENDAR_H_0078845c on
</span><span class="cx"> ATTACHMENT(CALENDAR_HOME_RESOURCE_ID);
</span><span class="cx">
</span><span class="cx"> drop index ADDRESSBOOK_HOME_META_cfe06701;
</span><span class="cx"> alter table ADDRESSBOOK_HOME_METADATA
</span><del>- add primary key(RESOURCE_ID);
</del><ins>+ add primary key (RESOURCE_ID);
</ins><span class="cx">
</span><span class="cx"> drop index ADDRESSBOOK_BIND_HOME_6a6dc8ce;
</span><span class="cx">
</span><span class="lines">@@ -65,19 +65,19 @@
</span><span class="cx"> drop index NOTIFICATION_OBJECT_R_47002cd8;
</span><span class="cx">
</span><span class="cx"> alter table CALENDARSERVER
</span><del>- drop unique(NAME);
</del><ins>+ drop unique (NAME);
</ins><span class="cx"> alter table CALENDARSERVER
</span><del>- add primary key(NAME);
</del><ins>+ add primary key (NAME);
</ins><span class="cx">
</span><span class="cx"> alter table CALENDAR_OBJECT_REVISIONS
</span><del>- drop unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME);
</del><ins>+ drop unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME);
</ins><span class="cx"> create index CALENDAR_OBJECT_REVIS_2643d556 on CALENDAR_OBJECT_REVISIONS (
</span><span class="cx"> CALENDAR_RESOURCE_ID,
</span><span class="cx"> RESOURCE_NAME
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> alter table ADDRESSBOOK_OBJECT_REVISIONS
</span><del>- drop unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME);
</del><ins>+ drop unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME);
</ins><span class="cx"> create index ADDRESSBOOK_OBJECT_RE_9a848f39 on ADDRESSBOOK_OBJECT_REVISIONS (
</span><span class="cx"> ADDRESSBOOK_RESOURCE_ID,
</span><span class="cx"> RESOURCE_NAME
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_5_to_6sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_5_to_6.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_5_to_6.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_5_to_6.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> "RESOURCE_KEY" nvarchar2(255),
</span><span class="cx"> "MODIFIED" integer not null,
</span><span class="cx"> "SUBSCRIBER_GUID" nvarchar2(255),
</span><del>- unique(TOKEN, RESOURCE_KEY) -- implicit index
</del><ins>+ unique (TOKEN, RESOURCE_KEY) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index APN_SUBSCRIPTIONS_RES_9610d78e
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_6_to_7sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_6_to_7.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_6_to_7.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_6_to_7.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -56,9 +56,9 @@
</span><span class="cx">
</span><span class="cx"> -- Change a constraint
</span><span class="cx"> alter table APN_SUBSCRIPTIONS
</span><del>- drop unique(TOKEN, RESOURCE_KEY);
</del><ins>+ drop unique (TOKEN, RESOURCE_KEY);
</ins><span class="cx"> alter table APN_SUBSCRIPTIONS
</span><del>- add primary key(TOKEN, RESOURCE_KEY);
</del><ins>+ add primary key (TOKEN, RESOURCE_KEY);
</ins><span class="cx">
</span><span class="cx"> -- Now update the version
</span><span class="cx"> update CALENDARSERVER set VALUE = '7' where NAME = 'VERSION';
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_11_to_12sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_11_to_12.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_11_to_12.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_11_to_12.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> PID integer not null,
</span><span class="cx"> PORT integer not null,
</span><span class="cx"> TIME timestamp not null default timezone('UTC', CURRENT_TIMESTAMP),
</span><del>- primary key(HOSTNAME, PORT)
</del><ins>+ primary key (HOSTNAME, PORT)
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> -- Now update the version
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_30_to_31sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_30_to_31.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_30_to_31.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_30_to_31.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> add column REVISION integer default nextval('REVISION_SEQ') not null,
</span><span class="cx"> add column REMOVED boolean default false not null,
</span><span class="cx"> drop constraint abo_members_pkey,
</span><del>- add constraint abo_members_pkey primary key(GROUP_ID, MEMBER_ID, REVISION);
</del><ins>+ add constraint abo_members_pkey primary key (GROUP_ID, MEMBER_ID, REVISION);
</ins><span class="cx">
</span><span class="cx"> ------------------------------------------
</span><span class="cx"> -- Change Address Book Object Revisions --
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_39_to_40sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_39_to_40.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_39_to_40.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_39_to_40.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> drop index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE;
</span><span class="cx"> alter table SCHEDULE_REFRESH_ATTENDEES add
</span><del>- primary key(RESOURCE_ID, ATTENDEE);
</del><ins>+ primary key (RESOURCE_ID, ATTENDEE);
</ins><span class="cx">
</span><span class="cx"> -- update the version
</span><span class="cx"> update CALENDARSERVER set VALUE = '40' where NAME = 'VERSION';
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_47_to_48sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_47_to_48.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_47_to_48.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_47_to_48.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> drop index PERUSER_TIME_RANGE_INSTANCE_ID;
</span><span class="cx">
</span><span class="cx"> -- Add unique to CALENDAR_OBJECT_REVISIONS and remove old index
</span><del>-alter table CALENDAR_OBJECT_REVISIONS add unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME);
</del><ins>+alter table CALENDAR_OBJECT_REVISIONS add unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME);
</ins><span class="cx"> drop index CALENDAR_OBJECT_REVISIONS_HOME_RESOURCE_ID_CALENDAR_RESOURCE_ID;
</span><span class="cx">
</span><span class="cx"> -- Add unique to ADDRESSBOOK_OBJECT_REVISIONS and remove old index
</span><del>-alter table ADDRESSBOOK_OBJECT_REVISIONS add unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME);
</del><ins>+alter table ADDRESSBOOK_OBJECT_REVISIONS add unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME);
</ins><span class="cx"> drop index ADDRESSBOOK_OBJECT_REVISIONS_HOME_RESOURCE_ID_OWNER_HOME_RESOURCE_ID;
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_4_to_5sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_4_to_5.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_4_to_5.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_4_to_5.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">
</span><span class="cx"> drop index CALENDAR_HOME_METADATA_RESOURCE_ID;
</span><span class="cx"> alter table CALENDAR_HOME_METADATA
</span><del>- add primary key(RESOURCE_ID);
</del><ins>+ add primary key (RESOURCE_ID);
</ins><span class="cx">
</span><span class="cx"> drop index INVITE_RESOURCE_ID;
</span><span class="cx"> create index INVITE_RESOURCE_ID on INVITE(RESOURCE_ID);
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> drop index ATTACHMENT_DROPBOX_ID;
</span><span class="cx"> alter table ATTACHMENT
</span><span class="cx"> drop constraint ATTACHMENT_DROPBOX_ID_PATH_KEY,
</span><del>- add primary key(DROPBOX_ID, PATH);
</del><ins>+ add primary key (DROPBOX_ID, PATH);
</ins><span class="cx"> create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
</span><span class="cx"> ATTACHMENT(CALENDAR_HOME_RESOURCE_ID);
</span><span class="cx">
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> drop index ADDRESSBOOK_HOME_METADATA_RESOURCE_ID;
</span><span class="cx"> alter table ADDRESSBOOK_HOME_METADATA
</span><del>- add primary key(RESOURCE_ID);
</del><ins>+ add primary key (RESOURCE_ID);
</ins><span class="cx">
</span><span class="cx"> drop index ADDRESSBOOK_BIND_HOME_RESOURCE_ID;
</span><span class="cx">
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> alter table CALENDARSERVER
</span><span class="cx"> drop constraint CALENDARSERVER_NAME_KEY,
</span><del>- add primary key(NAME);
</del><ins>+ add primary key (NAME);
</ins><span class="cx">
</span><span class="cx"> -- Now update the version
</span><span class="cx"> update CALENDARSERVER set VALUE = '5' where NAME = 'VERSION';
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_5_to_6sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_5_to_6.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_5_to_6.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_5_to_6.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> RESOURCE_KEY varchar(255) not null,
</span><span class="cx"> MODIFIED integer not null,
</span><span class="cx"> SUBSCRIBER_GUID varchar(255) not null,
</span><del>- unique(TOKEN, RESOURCE_KEY) -- implicit index
</del><ins>+ unique (TOKEN, RESOURCE_KEY) -- implicit index
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index APN_SUBSCRIPTIONS_RESOURCE_KEY
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_6_to_7sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_6_to_7.sql (15312 => 15313)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_6_to_7.sql 2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_6_to_7.sql 2015-11-15 18:17:50 UTC (rev 15313)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> -- Change a constraint
</span><span class="cx"> alter table APN_SUBSCRIPTIONS
</span><span class="cx"> drop constraint APN_SUBSCRIPTIONS_TOKEN_RESOURCE_KEY_KEY,
</span><del>- add primary key(TOKEN, RESOURCE_KEY);
</del><ins>+ add primary key (TOKEN, RESOURCE_KEY);
</ins><span class="cx">
</span><span class="cx"> -- Now update the version
</span><span class="cx"> update CALENDARSERVER set VALUE = '7' where NAME = 'VERSION';
</span></span></pre>
</div>
</div>
</body>
</html>