<!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>[13868] CalendarServer/trunk</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/13868">13868</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-08-12 13:45:40 -0700 (Tue, 12 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Added support for fetching delegate assignments from the directory</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsprincipalspy">CalendarServer/trunk/calendarserver/tools/principals.py</a></li>
<li><a href="#CalendarServertrunkconfcaldavdtestplist">CalendarServer/trunk/conf/caldavd-test.plist</a></li>
<li><a href="#CalendarServertrunkrequirementsstabletxt">CalendarServer/trunk/requirements-stable.txt</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorycalendaruserproxypy">CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemacurrentoracledialectsql">CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemacurrentsql">CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql</a></li>
<li><a href="#CalendarServertrunktxdavdpsclientpy">CalendarServer/trunk/txdav/dps/client.py</a></li>
<li><a href="#CalendarServertrunktxdavdpscommandspy">CalendarServer/trunk/txdav/dps/commands.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsjsonpy">CalendarServer/trunk/txdav/dps/json.py</a></li>
<li><a href="#CalendarServertrunktxdavdpsserverpy">CalendarServer/trunk/txdav/dps/server.py</a></li>
<li><a href="#CalendarServertrunktxdavdpstesttest_clientpy">CalendarServer/trunk/txdav/dps/test/test_client.py</a></li>
<li><a href="#CalendarServertrunktxdavwhocachepy">CalendarServer/trunk/txdav/who/cache.py</a></li>
<li><a href="#CalendarServertrunktxdavwhodirectorypy">CalendarServer/trunk/txdav/who/directory.py</a></li>
<li><a href="#CalendarServertrunktxdavwhogroupspy">CalendarServer/trunk/txdav/who/groups.py</a></li>
<li><a href="#CalendarServertrunktxdavwhoidirectorypy">CalendarServer/trunk/txdav/who/idirectory.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_groupspy">CalendarServer/trunk/txdav/who/test/test_groups.py</a></li>
<li><a href="#CalendarServertrunktxdavwhoutilpy">CalendarServer/trunk/txdav/who/util.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv46sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v46.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv46sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v46.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_46_to_47sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_46_to_47.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_46_to_47sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_46_to_47.sql</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertapcaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/caldav.py (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -941,7 +941,8 @@
</span><span class="cx"> if config.GroupCaching.Enabled:
</span><span class="cx"> groupCacher = GroupCacher(
</span><span class="cx"> directory,
</span><del>- updateSeconds=config.GroupCaching.UpdateSeconds
</del><ins>+ updateSeconds=config.GroupCaching.UpdateSeconds,
+ useDirectoryBasedDelegates=config.GroupCaching.UseDirectoryBasedDelegates,
</ins><span class="cx"> )
</span><span class="cx"> else:
</span><span class="cx"> groupCacher = None
</span><span class="lines">@@ -1091,7 +1092,7 @@
</span><span class="cx"> WorkSchedulingService(
</span><span class="cx"> store,
</span><span class="cx"> config.Scheduling.iMIP.Enabled,
</span><del>- (config.GroupCaching.Enabled and config.GroupCaching.EnableUpdater),
</del><ins>+ config.GroupCaching.Enabled,
</ins><span class="cx"> config.AutomaticPurging.Enabled
</span><span class="cx"> ).setServiceParent(service)
</span><span class="cx">
</span><span class="lines">@@ -1309,7 +1310,8 @@
</span><span class="cx"> if config.GroupCaching.Enabled:
</span><span class="cx"> groupCacher = GroupCacher(
</span><span class="cx"> directory,
</span><del>- updateSeconds=config.GroupCaching.UpdateSeconds
</del><ins>+ updateSeconds=config.GroupCaching.UpdateSeconds,
+ useDirectoryBasedDelegates=config.GroupCaching.UseDirectoryBasedDelegates,
</ins><span class="cx"> )
</span><span class="cx"> else:
</span><span class="cx"> groupCacher = None
</span><span class="lines">@@ -1895,7 +1897,8 @@
</span><span class="cx"> if config.GroupCaching.Enabled:
</span><span class="cx"> groupCacher = GroupCacher(
</span><span class="cx"> directory,
</span><del>- updateSeconds=config.GroupCaching.UpdateSeconds
</del><ins>+ updateSeconds=config.GroupCaching.UpdateSeconds,
+ useDirectoryBasedDelegates=config.GroupCaching.UseDirectoryBasedDelegates,
</ins><span class="cx"> )
</span><span class="cx"> else:
</span><span class="cx"> groupCacher = None
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsprincipalspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/principals.py (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/principals.py 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/calendarserver/tools/principals.py 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -883,10 +883,16 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def printRecordList(records):
</span><del>- results = [
- (record.displayName, record.recordType.name, record.uid, record.shortNames)
- for record in records
- ]
</del><ins>+ results = []
+ for record in records:
+ try:
+ shortNames = record.shortNames
+ except AttributeError:
+ shortNames = []
+ results.append(
+ (record.displayName, record.recordType.name, record.uid, shortNames)
+ )
+
</ins><span class="cx"> results.sort()
</span><span class="cx"> format = "%-22s %-10s %-20s %s"
</span><span class="cx"> print(format % ("Full name", "Type", "UID", "Short names"))
</span></span></pre></div>
<a id="CalendarServertrunkconfcaldavdtestplist"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/conf/caldavd-test.plist (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/conf/caldavd-test.plist 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/conf/caldavd-test.plist 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -883,17 +883,9 @@
</span><span class="cx"> <dict>
</span><span class="cx"> <key>Enabled</key>
</span><span class="cx"> <true/>
</span><del>- <key>EnableUpdater</key>
- <true/>
- <key>MemcachedPool</key>
- <string>Default</string>
</del><span class="cx"> <key>UpdateSeconds</key>
</span><span class="cx"> <integer>300</integer>
</span><del>- <key>ExpireSeconds</key>
- <integer>3600</integer>
- <key>LockSeconds</key>
- <integer>300</integer>
- <key>UseExternalProxies</key>
</del><ins>+ <key>UseDirectoryBasedDelegates</key>
</ins><span class="cx"> <false/>
</span><span class="cx"> </dict>
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunkrequirementsstabletxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-stable.txt (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-stable.txt 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/requirements-stable.txt 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> # For CalendarServer development, don't try to get these projects from PyPI; use svn.
</span><span class="cx">
</span><span class="cx"> -e .
</span><del>--e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13857#egg=twextpy
</del><ins>+-e svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@13867#egg=twextpy
</ins><span class="cx"> -e svn+http://svn.calendarserver.org/repository/calendarserver/PyKerberos/trunk@13420#egg=kerberos
</span><span class="cx"> -e svn+http://svn.calendarserver.org/repository/calendarserver/PyCalendar/trunk@13802#egg=pycalendar
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorycalendaruserproxypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/twistedcaldav/directory/calendaruserproxy.py 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -129,12 +129,16 @@
</span><span class="cx"> guid = record.guid
</span><span class="cx"> except AttributeError:
</span><span class="cx"> guid = ""
</span><ins>+ try:
+ shortNames = record.shortNames
+ except AttributeError:
+ shortNames = []
</ins><span class="cx"> return tag.fillSlots(
</span><span class="cx"> directoryGUID=record.service.guid,
</span><span class="cx"> realm=record.service.realmName,
</span><span class="cx"> guid=guid,
</span><span class="cx"> recordType=record.service.recordTypeToOldName(record.recordType),
</span><del>- shortNames=record.shortNames,
</del><ins>+ shortNames=shortNames,
</ins><span class="cx"> fullName=record.displayName,
</span><span class="cx"> principalUID=parent.principalUID(),
</span><span class="cx"> principalURL=formatLink(parent.principalURL()),
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -79,6 +79,8 @@
</span><span class="cx"> "fullNames": ["cn", ],
</span><span class="cx"> "emailAddresses": ["mail", ],
</span><span class="cx"> "memberDNs": ["uniqueMember", ],
</span><ins>+ "readWriteProxy": ["icsContact", ],
+ "readOnlyProxy": ["icsSecondaryOwners", ],
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx"> }
</span><span class="lines">@@ -965,10 +967,8 @@
</span><span class="cx">
</span><span class="cx"> "GroupCaching" : {
</span><span class="cx"> "Enabled": True,
</span><del>- "MemcachedPool" : "Default",
</del><span class="cx"> "UpdateSeconds" : 300,
</span><del>- "EnableUpdater" : True,
- "UseExternalProxies" : False,
</del><ins>+ "UseDirectoryBasedDelegates" : False,
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> "GroupAttendees" : {
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -1339,17 +1339,17 @@
</span><span class="cx">
</span><span class="cx"> """
</span><span class="cx"> if record is not None:
</span><del>- members = yield record.expandedMembers()
</del><ins>+ memberUIDs = yield record.expandedMemberUIDs()
</ins><span class="cx"> name = record.displayName
</span><span class="cx"> extant = True
</span><span class="cx"> else:
</span><del>- members = frozenset()
</del><ins>+ memberUIDs = frozenset()
</ins><span class="cx"> name = cachedName
</span><span class="cx"> extant = False
</span><span class="cx">
</span><span class="cx"> membershipHashContent = hashlib.md5()
</span><del>- for member in sorted(members, key=lambda x: x.uid):
- membershipHashContent.update(str(member.uid))
</del><ins>+ for memberUID in sorted(memberUIDs):
+ membershipHashContent.update(str(memberUID))
</ins><span class="cx"> membershipHash = membershipHashContent.hexdigest()
</span><span class="cx">
</span><span class="cx"> if cachedMembershipHash != membershipHash:
</span><span class="lines">@@ -1368,8 +1368,8 @@
</span><span class="cx">
</span><span class="cx"> if membershipChanged:
</span><span class="cx"> newMemberUIDs = set()
</span><del>- for member in members:
- newMemberUIDs.add(member.uid)
</del><ins>+ for memberUID in memberUIDs:
+ newMemberUIDs.add(memberUID)
</ins><span class="cx"> yield self.synchronizeMembers(groupID, newMemberUIDs)
</span><span class="cx">
</span><span class="cx"> returnValue(membershipChanged)
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemacurrentoracledialectsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -405,10 +405,18 @@
</span><span class="cx"> "GROUP_UID" nvarchar2(255)
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+create table GROUP_DELEGATE_CHANGES_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB,
+ "DELEGATOR_UID" nvarchar2(255),
+ "READ_DELEGATE_UID" nvarchar2(255),
+ "WRITE_DELEGATE_UID" nvarchar2(255)
+);
+
</ins><span class="cx"> create table GROUPS (
</span><span class="cx"> "GROUP_ID" integer primary key,
</span><span class="cx"> "NAME" nvarchar2(255),
</span><del>- "GROUP_UID" nvarchar2(255),
</del><ins>+ "GROUP_UID" nvarchar2(255) unique,
</ins><span class="cx"> "MEMBERSHIP_HASH" nvarchar2(255),
</span><span class="cx"> "EXTANT" integer default 1,
</span><span class="cx"> "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="lines">@@ -596,7 +604,7 @@
</span><span class="cx"> "VALUE" nvarchar2(255)
</span><span class="cx"> );
</span><span class="cx">
</span><del>-insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '46');
</del><ins>+insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '47');
</ins><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '6');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('NOTIFICATION-DATAVERSION', '1');
</span><span class="lines">@@ -754,6 +762,10 @@
</span><span class="cx"> JOB_ID
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+create index GROUP_DELEGATE_CHANGE_8bf9e6d8 on GROUP_DELEGATE_CHANGES_WORK (
+ JOB_ID
+);
+
</ins><span class="cx"> create index GROUPS_GROUP_UID_b35cce23 on GROUPS (
</span><span class="cx"> GROUP_UID
</span><span class="cx"> );
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemacurrentsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -762,10 +762,21 @@
</span><span class="cx"> create index GROUP_REFRESH_WORK_JOB_ID on
</span><span class="cx"> GROUP_REFRESH_WORK(JOB_ID);
</span><span class="cx">
</span><ins>+create table GROUP_DELEGATE_CHANGES_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null,
+ DELEGATOR_UID varchar(255) not null,
+ READ_DELEGATE_UID varchar(255) not null,
+ WRITE_DELEGATE_UID varchar(255) not null
+);
+
+create index GROUP_DELEGATE_CHANGES_WORK_JOB_ID on
+ GROUP_DELEGATE_CHANGES_WORK(JOB_ID);
+
</ins><span class="cx"> create table GROUPS (
</span><span class="cx"> GROUP_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
</span><span class="cx"> NAME varchar(255) not null,
</span><del>- GROUP_UID varchar(255) not null,
</del><ins>+ GROUP_UID varchar(255) not null unique,
</ins><span class="cx"> MEMBERSHIP_HASH varchar(255) not null,
</span><span class="cx"> EXTANT integer default 1,
</span><span class="cx"> CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="lines">@@ -777,7 +788,7 @@
</span><span class="cx"> create table GROUP_MEMBERSHIP (
</span><span class="cx"> GROUP_ID integer not null references GROUPS on delete cascade,
</span><span class="cx"> MEMBER_UID varchar(255) not null,
</span><del>-
</del><ins>+
</ins><span class="cx"> primary key (GROUP_ID, MEMBER_UID)
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -798,19 +809,19 @@
</span><span class="cx"> create index GROUP_ATTENDEE_RECONCILE_WORK_GROUP_ID on
</span><span class="cx"> GROUP_ATTENDEE_RECONCILE_WORK(GROUP_ID);
</span><span class="cx">
</span><del>-
</del><ins>+
</ins><span class="cx"> create table GROUP_ATTENDEE (
</span><span class="cx"> GROUP_ID integer not null references GROUPS on delete cascade,
</span><span class="cx"> RESOURCE_ID integer not null references CALENDAR_OBJECT on delete cascade,
</span><span class="cx"> MEMBERSHIP_HASH varchar(255) not null,
</span><del>-
</del><ins>+
</ins><span class="cx"> primary key (GROUP_ID, RESOURCE_ID)
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> create index GROUP_ATTENDEE_RESOURCE_ID on
</span><span class="cx"> GROUP_ATTENDEE(RESOURCE_ID);
</span><span class="cx">
</span><del>-
</del><ins>+
</ins><span class="cx"> create table GROUP_SHAREE_RECONCILE_WORK (
</span><span class="cx"> WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><span class="cx"> JOB_ID integer not null references JOB,
</span><span class="lines">@@ -831,7 +842,7 @@
</span><span class="cx"> CALENDAR_ID integer not null references CALENDAR on delete cascade,
</span><span class="cx"> GROUP_BIND_MODE integer not null, -- enum CALENDAR_BIND_MODE
</span><span class="cx"> MEMBERSHIP_HASH varchar(255) not null,
</span><del>-
</del><ins>+
</ins><span class="cx"> primary key (GROUP_ID, CALENDAR_ID)
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -960,7 +971,7 @@
</span><span class="cx"> create table SCHEDULE_REFRESH_ATTENDEES (
</span><span class="cx"> RESOURCE_ID integer not null references CALENDAR_OBJECT on delete cascade,
</span><span class="cx"> ATTENDEE varchar(255) not null,
</span><del>-
</del><ins>+
</ins><span class="cx"> primary key (RESOURCE_ID, ATTENDEE)
</span><span class="cx"> );
</span><span class="cx">
</span><span class="lines">@@ -1127,7 +1138,7 @@
</span><span class="cx"> VALUE varchar(255)
</span><span class="cx"> );
</span><span class="cx">
</span><del>-insert into CALENDARSERVER values ('VERSION', '46');
</del><ins>+insert into CALENDARSERVER values ('VERSION', '47');
</ins><span class="cx"> insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '6');
</span><span class="cx"> insert into CALENDARSERVER values ('ADDRESSBOOK-DATAVERSION', '2');
</span><span class="cx"> insert into CALENDARSERVER values ('NOTIFICATION-DATAVERSION', '1');
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv46sql"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v46.sql (0 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v46.sql (rev 0)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v46.sql 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -0,0 +1,908 @@
</span><ins>+create sequence RESOURCE_ID_SEQ;
+create sequence JOB_SEQ;
+create sequence INSTANCE_ID_SEQ;
+create sequence ATTACHMENT_ID_SEQ;
+create sequence REVISION_SEQ;
+create sequence WORKITEM_SEQ;
+create table NODE_INFO (
+ "HOSTNAME" nvarchar2(255),
+ "PID" integer not null,
+ "PORT" integer not null,
+ "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
+ primary key ("HOSTNAME", "PORT")
+);
+
+create table NAMED_LOCK (
+ "LOCK_NAME" nvarchar2(255) primary key
+);
+
+create table JOB (
+ "JOB_ID" integer primary key not null,
+ "WORK_TYPE" nvarchar2(255),
+ "PRIORITY" integer default 0,
+ "WEIGHT" integer default 0,
+ "NOT_BEFORE" timestamp not null,
+ "ASSIGNED" timestamp default null,
+ "OVERDUE" timestamp default null,
+ "FAILED" integer default 0
+);
+
+create table CALENDAR_HOME (
+ "RESOURCE_ID" integer primary key,
+ "OWNER_UID" nvarchar2(255) unique,
+ "STATUS" integer default 0 not null,
+ "DATAVERSION" integer default 0 not null
+);
+
+create table HOME_STATUS (
+ "ID" integer primary key,
+ "DESCRIPTION" nvarchar2(16) unique
+);
+
+insert into HOME_STATUS (DESCRIPTION, ID) values ('normal', 0);
+insert into HOME_STATUS (DESCRIPTION, ID) values ('external', 1);
+insert into HOME_STATUS (DESCRIPTION, ID) values ('purging', 2);
+create table CALENDAR (
+ "RESOURCE_ID" integer primary key
+);
+
+create table CALENDAR_HOME_METADATA (
+ "RESOURCE_ID" integer primary key references CALENDAR_HOME on delete cascade,
+ "QUOTA_USED_BYTES" integer default 0 not null,
+ "DEFAULT_EVENTS" integer default null references CALENDAR on delete set null,
+ "DEFAULT_TASKS" integer default null references CALENDAR on delete set null,
+ "DEFAULT_POLLS" integer default null references CALENDAR on delete set null,
+ "ALARM_VEVENT_TIMED" nclob default null,
+ "ALARM_VEVENT_ALLDAY" nclob default null,
+ "ALARM_VTODO_TIMED" nclob default null,
+ "ALARM_VTODO_ALLDAY" nclob default null,
+ "AVAILABILITY" nclob default null,
+ "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table CALENDAR_METADATA (
+ "RESOURCE_ID" integer primary key references CALENDAR on delete cascade,
+ "SUPPORTED_COMPONENTS" nvarchar2(255) default null,
+ "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table NOTIFICATION_HOME (
+ "RESOURCE_ID" integer primary key,
+ "OWNER_UID" nvarchar2(255) unique,
+ "STATUS" integer default 0 not null,
+ "DATAVERSION" integer default 0 not null
+);
+
+create table NOTIFICATION (
+ "RESOURCE_ID" integer primary key,
+ "NOTIFICATION_HOME_RESOURCE_ID" integer not null references NOTIFICATION_HOME,
+ "NOTIFICATION_UID" nvarchar2(255),
+ "NOTIFICATION_TYPE" nvarchar2(255),
+ "NOTIFICATION_DATA" nclob,
+ "MD5" nchar(32),
+ "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+);
+
+create table CALENDAR_BIND (
+ "CALENDAR_HOME_RESOURCE_ID" integer not null references CALENDAR_HOME,
+ "CALENDAR_RESOURCE_ID" integer not null references CALENDAR on delete cascade,
+ "EXTERNAL_ID" integer default null,
+ "CALENDAR_RESOURCE_NAME" nvarchar2(255),
+ "BIND_MODE" integer not null,
+ "BIND_STATUS" integer not null,
+ "BIND_REVISION" integer default 0 not null,
+ "MESSAGE" nclob,
+ "TRANSP" integer default 0 not null,
+ "ALARM_VEVENT_TIMED" nclob default null,
+ "ALARM_VEVENT_ALLDAY" nclob default null,
+ "ALARM_VTODO_TIMED" nclob default null,
+ "ALARM_VTODO_ALLDAY" nclob default null,
+ "TIMEZONE" nclob default null,
+ primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+);
+
+create table CALENDAR_BIND_MODE (
+ "ID" integer primary key,
+ "DESCRIPTION" nvarchar2(16) unique
+);
+
+insert into CALENDAR_BIND_MODE (DESCRIPTION, ID) values ('own', 0);
+insert into CALENDAR_BIND_MODE (DESCRIPTION, ID) values ('read', 1);
+insert into CALENDAR_BIND_MODE (DESCRIPTION, ID) values ('write', 2);
+insert into CALENDAR_BIND_MODE (DESCRIPTION, ID) values ('direct', 3);
+insert into CALENDAR_BIND_MODE (DESCRIPTION, ID) values ('indirect', 4);
+insert into CALENDAR_BIND_MODE (DESCRIPTION, ID) values ('group', 5);
+insert into CALENDAR_BIND_MODE (DESCRIPTION, ID) values ('group_read', 6);
+insert into CALENDAR_BIND_MODE (DESCRIPTION, ID) values ('group_write', 7);
+create table CALENDAR_BIND_STATUS (
+ "ID" integer primary key,
+ "DESCRIPTION" nvarchar2(16) unique
+);
+
+insert into CALENDAR_BIND_STATUS (DESCRIPTION, ID) values ('invited', 0);
+insert into CALENDAR_BIND_STATUS (DESCRIPTION, ID) values ('accepted', 1);
+insert into CALENDAR_BIND_STATUS (DESCRIPTION, ID) values ('declined', 2);
+insert into CALENDAR_BIND_STATUS (DESCRIPTION, ID) values ('invalid', 3);
+insert into CALENDAR_BIND_STATUS (DESCRIPTION, ID) values ('deleted', 4);
+create table CALENDAR_TRANSP (
+ "ID" integer primary key,
+ "DESCRIPTION" nvarchar2(16) unique
+);
+
+insert into CALENDAR_TRANSP (DESCRIPTION, ID) values ('opaque', 0);
+insert into CALENDAR_TRANSP (DESCRIPTION, ID) values ('transparent', 1);
+create table CALENDAR_OBJECT (
+ "RESOURCE_ID" integer primary key,
+ "CALENDAR_RESOURCE_ID" integer not null references CALENDAR on delete cascade,
+ "RESOURCE_NAME" nvarchar2(255),
+ "ICALENDAR_TEXT" nclob,
+ "ICALENDAR_UID" nvarchar2(255),
+ "ICALENDAR_TYPE" nvarchar2(255),
+ "ATTACHMENTS_MODE" integer default 0 not null,
+ "DROPBOX_ID" nvarchar2(255),
+ "ORGANIZER" nvarchar2(255),
+ "RECURRANCE_MIN" date,
+ "RECURRANCE_MAX" date,
+ "ACCESS" integer default 0 not null,
+ "SCHEDULE_OBJECT" integer default 0,
+ "SCHEDULE_TAG" nvarchar2(36) default null,
+ "SCHEDULE_ETAGS" nclob default null,
+ "PRIVATE_COMMENTS" integer default 0 not null,
+ "MD5" nchar(32),
+ "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "DATAVERSION" integer default 0 not null,
+ unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+);
+
+create table CALENDAR_OBJ_ATTACHMENTS_MODE (
+ "ID" integer primary key,
+ "DESCRIPTION" nvarchar2(16) unique
+);
+
+insert into CALENDAR_OBJ_ATTACHMENTS_MODE (DESCRIPTION, ID) values ('none', 0);
+insert into CALENDAR_OBJ_ATTACHMENTS_MODE (DESCRIPTION, ID) values ('read', 1);
+insert into CALENDAR_OBJ_ATTACHMENTS_MODE (DESCRIPTION, ID) values ('write', 2);
+create table CALENDAR_ACCESS_TYPE (
+ "ID" integer primary key,
+ "DESCRIPTION" nvarchar2(32) unique
+);
+
+insert into CALENDAR_ACCESS_TYPE (DESCRIPTION, ID) values ('', 0);
+insert into CALENDAR_ACCESS_TYPE (DESCRIPTION, ID) values ('public', 1);
+insert into CALENDAR_ACCESS_TYPE (DESCRIPTION, ID) values ('private', 2);
+insert into CALENDAR_ACCESS_TYPE (DESCRIPTION, ID) values ('confidential', 3);
+insert into CALENDAR_ACCESS_TYPE (DESCRIPTION, ID) values ('restricted', 4);
+create table TIME_RANGE (
+ "INSTANCE_ID" integer primary key,
+ "CALENDAR_RESOURCE_ID" integer not null references CALENDAR on delete cascade,
+ "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
+ "FLOATING" integer not null,
+ "START_DATE" timestamp not null,
+ "END_DATE" timestamp not null,
+ "FBTYPE" integer not null,
+ "TRANSPARENT" integer not null
+);
+
+create table FREE_BUSY_TYPE (
+ "ID" integer primary key,
+ "DESCRIPTION" nvarchar2(16) unique
+);
+
+insert into FREE_BUSY_TYPE (DESCRIPTION, ID) values ('unknown', 0);
+insert into FREE_BUSY_TYPE (DESCRIPTION, ID) values ('free', 1);
+insert into FREE_BUSY_TYPE (DESCRIPTION, ID) values ('busy', 2);
+insert into FREE_BUSY_TYPE (DESCRIPTION, ID) values ('busy-unavailable', 3);
+insert into FREE_BUSY_TYPE (DESCRIPTION, ID) values ('busy-tentative', 4);
+create table PERUSER (
+ "TIME_RANGE_INSTANCE_ID" integer not null references TIME_RANGE on delete cascade,
+ "USER_ID" nvarchar2(255),
+ "TRANSPARENT" integer not null,
+ "ADJUSTED_START_DATE" timestamp default null,
+ "ADJUSTED_END_DATE" timestamp default null
+);
+
+create table ATTACHMENT (
+ "ATTACHMENT_ID" integer primary key,
+ "CALENDAR_HOME_RESOURCE_ID" integer not null references CALENDAR_HOME,
+ "DROPBOX_ID" nvarchar2(255),
+ "CONTENT_TYPE" nvarchar2(255),
+ "SIZE" integer not null,
+ "MD5" nchar(32),
+ "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "PATH" nvarchar2(1024)
+);
+
+create table ATTACHMENT_CALENDAR_OBJECT (
+ "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
+ "MANAGED_ID" nvarchar2(255),
+ "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
+ primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+);
+
+create table RESOURCE_PROPERTY (
+ "RESOURCE_ID" integer not null,
+ "NAME" nvarchar2(255),
+ "VALUE" nclob,
+ "VIEWER_UID" nvarchar2(255),
+ primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
+);
+
+create table ADDRESSBOOK_HOME (
+ "RESOURCE_ID" integer primary key,
+ "ADDRESSBOOK_PROPERTY_STORE_ID" integer not null,
+ "OWNER_UID" nvarchar2(255) unique,
+ "STATUS" integer default 0 not null,
+ "DATAVERSION" integer default 0 not null
+);
+
+create table ADDRESSBOOK_HOME_METADATA (
+ "RESOURCE_ID" integer primary key references ADDRESSBOOK_HOME on delete cascade,
+ "QUOTA_USED_BYTES" integer default 0 not null,
+ "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table SHARED_ADDRESSBOOK_BIND (
+ "ADDRESSBOOK_HOME_RESOURCE_ID" integer not null references ADDRESSBOOK_HOME,
+ "OWNER_HOME_RESOURCE_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
+ "EXTERNAL_ID" integer default null,
+ "ADDRESSBOOK_RESOURCE_NAME" nvarchar2(255),
+ "BIND_MODE" integer not null,
+ "BIND_STATUS" integer not null,
+ "BIND_REVISION" integer default 0 not null,
+ "MESSAGE" nclob,
+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+);
+
+create table ADDRESSBOOK_OBJECT (
+ "RESOURCE_ID" integer primary key,
+ "ADDRESSBOOK_HOME_RESOURCE_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
+ "RESOURCE_NAME" nvarchar2(255),
+ "VCARD_TEXT" nclob,
+ "VCARD_UID" nvarchar2(255),
+ "KIND" integer not null,
+ "MD5" nchar(32),
+ "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "DATAVERSION" integer default 0 not null,
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+);
+
+create table ADDRESSBOOK_OBJECT_KIND (
+ "ID" integer primary key,
+ "DESCRIPTION" nvarchar2(16) unique
+);
+
+insert into ADDRESSBOOK_OBJECT_KIND (DESCRIPTION, ID) values ('person', 0);
+insert into ADDRESSBOOK_OBJECT_KIND (DESCRIPTION, ID) values ('group', 1);
+insert into ADDRESSBOOK_OBJECT_KIND (DESCRIPTION, ID) values ('resource', 2);
+insert into ADDRESSBOOK_OBJECT_KIND (DESCRIPTION, ID) values ('location', 3);
+create table ABO_MEMBERS (
+ "GROUP_ID" integer not null,
+ "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
+ "MEMBER_ID" integer not null,
+ "REVISION" integer not null,
+ "REMOVED" integer default 0 not null,
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
+);
+
+create table ABO_FOREIGN_MEMBERS (
+ "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
+ "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
+ "MEMBER_ADDRESS" nvarchar2(255),
+ primary key ("GROUP_ID", "MEMBER_ADDRESS")
+);
+
+create table SHARED_GROUP_BIND (
+ "ADDRESSBOOK_HOME_RESOURCE_ID" integer not null references ADDRESSBOOK_HOME,
+ "GROUP_RESOURCE_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
+ "EXTERNAL_ID" integer default null,
+ "GROUP_ADDRESSBOOK_NAME" nvarchar2(255),
+ "BIND_MODE" integer not null,
+ "BIND_STATUS" integer not null,
+ "BIND_REVISION" integer default 0 not null,
+ "MESSAGE" nclob,
+ primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+ unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+);
+
+create table CALENDAR_OBJECT_REVISIONS (
+ "CALENDAR_HOME_RESOURCE_ID" integer not null references CALENDAR_HOME,
+ "CALENDAR_RESOURCE_ID" integer references CALENDAR,
+ "CALENDAR_NAME" nvarchar2(255) default null,
+ "RESOURCE_NAME" nvarchar2(255),
+ "REVISION" integer not null,
+ "DELETED" integer not null,
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table ADDRESSBOOK_OBJECT_REVISIONS (
+ "ADDRESSBOOK_HOME_RESOURCE_ID" integer not null references ADDRESSBOOK_HOME,
+ "OWNER_HOME_RESOURCE_ID" integer references ADDRESSBOOK_HOME,
+ "ADDRESSBOOK_NAME" nvarchar2(255) default null,
+ "OBJECT_RESOURCE_ID" integer default 0,
+ "RESOURCE_NAME" nvarchar2(255),
+ "REVISION" integer not null,
+ "DELETED" integer not null,
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table NOTIFICATION_OBJECT_REVISIONS (
+ "NOTIFICATION_HOME_RESOURCE_ID" integer not null references NOTIFICATION_HOME on delete cascade,
+ "RESOURCE_NAME" nvarchar2(255),
+ "REVISION" integer not null,
+ "DELETED" integer not null,
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+);
+
+create table APN_SUBSCRIPTIONS (
+ "TOKEN" nvarchar2(255),
+ "RESOURCE_KEY" nvarchar2(255),
+ "MODIFIED" integer not null,
+ "SUBSCRIBER_GUID" nvarchar2(255),
+ "USER_AGENT" nvarchar2(255) default null,
+ "IP_ADDR" nvarchar2(255) default null,
+ primary key ("TOKEN", "RESOURCE_KEY")
+);
+
+create table IMIP_TOKENS (
+ "TOKEN" nvarchar2(255),
+ "ORGANIZER" nvarchar2(255),
+ "ATTENDEE" nvarchar2(255),
+ "ICALUID" nvarchar2(255),
+ "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
+);
+
+create table IMIP_INVITATION_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB,
+ "FROM_ADDR" nvarchar2(255),
+ "TO_ADDR" nvarchar2(255),
+ "ICALENDAR_TEXT" nclob
+);
+
+create table IMIP_POLLING_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB
+);
+
+create table IMIP_REPLY_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB,
+ "ORGANIZER" nvarchar2(255),
+ "ATTENDEE" nvarchar2(255),
+ "ICALENDAR_TEXT" nclob
+);
+
+create table PUSH_NOTIFICATION_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB,
+ "PUSH_ID" nvarchar2(255),
+ "PUSH_PRIORITY" integer not null
+);
+
+create table GROUP_CACHER_POLLING_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB
+);
+
+create table GROUP_REFRESH_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB,
+ "GROUP_UID" nvarchar2(255)
+);
+
+create table GROUPS (
+ "GROUP_ID" integer primary key,
+ "NAME" nvarchar2(255),
+ "GROUP_UID" nvarchar2(255),
+ "MEMBERSHIP_HASH" nvarchar2(255),
+ "EXTANT" integer default 1,
+ "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table GROUP_MEMBERSHIP (
+ "GROUP_ID" integer not null references GROUPS on delete cascade,
+ "MEMBER_UID" nvarchar2(255),
+ primary key ("GROUP_ID", "MEMBER_UID")
+);
+
+create table GROUP_ATTENDEE_RECONCILE_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB,
+ "RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
+ "GROUP_ID" integer not null references GROUPS on delete cascade
+);
+
+create table GROUP_ATTENDEE (
+ "GROUP_ID" integer not null references GROUPS on delete cascade,
+ "RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
+ "MEMBERSHIP_HASH" nvarchar2(255),
+ primary key ("GROUP_ID", "RESOURCE_ID")
+);
+
+create table GROUP_SHAREE_RECONCILE_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB,
+ "CALENDAR_ID" integer not null references CALENDAR on delete cascade,
+ "GROUP_ID" integer not null references GROUPS on delete cascade
+);
+
+create table GROUP_SHAREE (
+ "GROUP_ID" integer not null references GROUPS on delete cascade,
+ "CALENDAR_ID" integer not null references CALENDAR on delete cascade,
+ "GROUP_BIND_MODE" integer not null,
+ "MEMBERSHIP_HASH" nvarchar2(255),
+ primary key ("GROUP_ID", "CALENDAR_ID")
+);
+
+create table DELEGATES (
+ "DELEGATOR" nvarchar2(255),
+ "DELEGATE" nvarchar2(255),
+ "READ_WRITE" integer not null,
+ primary key ("DELEGATOR", "READ_WRITE", "DELEGATE")
+);
+
+create table DELEGATE_GROUPS (
+ "DELEGATOR" nvarchar2(255),
+ "GROUP_ID" integer not null references GROUPS on delete cascade,
+ "READ_WRITE" integer not null,
+ "IS_EXTERNAL" integer not null,
+ primary key ("DELEGATOR", "READ_WRITE", "GROUP_ID")
+);
+
+create table EXTERNAL_DELEGATE_GROUPS (
+ "DELEGATOR" nvarchar2(255) primary key,
+ "GROUP_UID_READ" nvarchar2(255),
+ "GROUP_UID_WRITE" nvarchar2(255)
+);
+
+create table CALENDAR_OBJECT_SPLITTER_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB,
+ "RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade
+);
+
+create table FIND_MIN_VALID_REVISION_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB
+);
+
+create table REVISION_CLEANUP_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB
+);
+
+create table INBOX_CLEANUP_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB
+);
+
+create table CLEANUP_ONE_INBOX_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB,
+ "HOME_ID" integer not null unique references CALENDAR_HOME on delete cascade
+);
+
+create table SCHEDULE_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB,
+ "ICALENDAR_UID" nvarchar2(255),
+ "WORK_TYPE" nvarchar2(255)
+);
+
+create table SCHEDULE_REFRESH_WORK (
+ "WORK_ID" integer primary key references SCHEDULE_WORK on delete cascade,
+ "HOME_RESOURCE_ID" integer not null references CALENDAR_HOME on delete cascade,
+ "RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
+ "ATTENDEE_COUNT" integer
+);
+
+create table SCHEDULE_REFRESH_ATTENDEES (
+ "RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
+ "ATTENDEE" nvarchar2(255),
+ primary key ("RESOURCE_ID", "ATTENDEE")
+);
+
+create table SCHEDULE_AUTO_REPLY_WORK (
+ "WORK_ID" integer primary key references SCHEDULE_WORK on delete cascade,
+ "HOME_RESOURCE_ID" integer not null references CALENDAR_HOME on delete cascade,
+ "RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
+ "PARTSTAT" nvarchar2(255)
+);
+
+create table SCHEDULE_ORGANIZER_WORK (
+ "WORK_ID" integer primary key references SCHEDULE_WORK on delete cascade,
+ "SCHEDULE_ACTION" integer not null,
+ "HOME_RESOURCE_ID" integer not null references CALENDAR_HOME on delete cascade,
+ "RESOURCE_ID" integer,
+ "ICALENDAR_TEXT_OLD" nclob,
+ "ICALENDAR_TEXT_NEW" nclob,
+ "ATTENDEE_COUNT" integer,
+ "SMART_MERGE" integer
+);
+
+create table SCHEDULE_ACTION (
+ "ID" integer primary key,
+ "DESCRIPTION" nvarchar2(16) unique
+);
+
+insert into SCHEDULE_ACTION (DESCRIPTION, ID) values ('create', 0);
+insert into SCHEDULE_ACTION (DESCRIPTION, ID) values ('modify', 1);
+insert into SCHEDULE_ACTION (DESCRIPTION, ID) values ('modify-cancelled', 2);
+insert into SCHEDULE_ACTION (DESCRIPTION, ID) values ('remove', 3);
+create table SCHEDULE_ORGANIZER_SEND_WORK (
+ "WORK_ID" integer primary key references SCHEDULE_WORK on delete cascade,
+ "SCHEDULE_ACTION" integer not null,
+ "HOME_RESOURCE_ID" integer not null references CALENDAR_HOME on delete cascade,
+ "RESOURCE_ID" integer,
+ "ATTENDEE" nvarchar2(255),
+ "ITIP_MSG" nclob,
+ "NO_REFRESH" integer
+);
+
+create table SCHEDULE_REPLY_WORK (
+ "WORK_ID" integer primary key references SCHEDULE_WORK on delete cascade,
+ "HOME_RESOURCE_ID" integer not null references CALENDAR_HOME on delete cascade,
+ "RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
+ "CHANGED_RIDS" nclob
+);
+
+create table SCHEDULE_REPLY_CANCEL_WORK (
+ "WORK_ID" integer primary key references SCHEDULE_WORK on delete cascade,
+ "HOME_RESOURCE_ID" integer not null references CALENDAR_HOME on delete cascade,
+ "ICALENDAR_TEXT" nclob
+);
+
+create table PRINCIPAL_PURGE_POLLING_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB
+);
+
+create table PRINCIPAL_PURGE_CHECK_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB,
+ "UID" nvarchar2(255)
+);
+
+create table PRINCIPAL_PURGE_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB,
+ "UID" nvarchar2(255)
+);
+
+create table PRINCIPAL_PURGE_HOME_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB,
+ "HOME_RESOURCE_ID" integer not null references CALENDAR_HOME on delete cascade
+);
+
+create table CALENDARSERVER (
+ "NAME" nvarchar2(255) primary key,
+ "VALUE" nvarchar2(255)
+);
+
+insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '46');
+insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '6');
+insert into CALENDARSERVER (NAME, VALUE) values ('ADDRESSBOOK-DATAVERSION', '2');
+insert into CALENDARSERVER (NAME, VALUE) values ('NOTIFICATION-DATAVERSION', '1');
+insert into CALENDARSERVER (NAME, VALUE) values ('MIN-VALID-REVISION', '1');
+create index CALENDAR_HOME_METADAT_3cb9049e on CALENDAR_HOME_METADATA (
+ DEFAULT_EVENTS
+);
+
+create index CALENDAR_HOME_METADAT_d55e5548 on CALENDAR_HOME_METADATA (
+ DEFAULT_TASKS
+);
+
+create index CALENDAR_HOME_METADAT_910264ce on CALENDAR_HOME_METADATA (
+ DEFAULT_POLLS
+);
+
+create index NOTIFICATION_NOTIFICA_f891f5f9 on NOTIFICATION (
+ NOTIFICATION_HOME_RESOURCE_ID
+);
+
+create index CALENDAR_BIND_RESOURC_e57964d4 on CALENDAR_BIND (
+ CALENDAR_RESOURCE_ID
+);
+
+create index CALENDAR_OBJECT_CALEN_a9a453a9 on CALENDAR_OBJECT (
+ CALENDAR_RESOURCE_ID,
+ ICALENDAR_UID
+);
+
+create index CALENDAR_OBJECT_CALEN_96e83b73 on CALENDAR_OBJECT (
+ CALENDAR_RESOURCE_ID,
+ RECURRANCE_MAX
+);
+
+create index CALENDAR_OBJECT_ICALE_82e731d5 on CALENDAR_OBJECT (
+ ICALENDAR_UID
+);
+
+create index CALENDAR_OBJECT_DROPB_de041d80 on CALENDAR_OBJECT (
+ DROPBOX_ID
+);
+
+create index TIME_RANGE_CALENDAR_R_beb6e7eb on TIME_RANGE (
+ CALENDAR_RESOURCE_ID
+);
+
+create index TIME_RANGE_CALENDAR_O_acf37bd1 on TIME_RANGE (
+ CALENDAR_OBJECT_RESOURCE_ID
+);
+
+create index PERUSER_TIME_RANGE_IN_5468a226 on PERUSER (
+ TIME_RANGE_INSTANCE_ID
+);
+
+create index ATTACHMENT_CALENDAR_H_0078845c on ATTACHMENT (
+ CALENDAR_HOME_RESOURCE_ID
+);
+
+create index ATTACHMENT_DROPBOX_ID_5073cf23 on ATTACHMENT (
+ DROPBOX_ID
+);
+
+create index ATTACHMENT_CALENDAR_O_81508484 on ATTACHMENT_CALENDAR_OBJECT (
+ CALENDAR_OBJECT_RESOURCE_ID
+);
+
+create index SHARED_ADDRESSBOOK_BI_e9a2e6d4 on SHARED_ADDRESSBOOK_BIND (
+ OWNER_HOME_RESOURCE_ID
+);
+
+create index ABO_MEMBERS_ADDRESSBO_4effa879 on ABO_MEMBERS (
+ ADDRESSBOOK_ID
+);
+
+create index ABO_MEMBERS_MEMBER_ID_8d66adcf on ABO_MEMBERS (
+ MEMBER_ID
+);
+
+create index ABO_FOREIGN_MEMBERS_A_1fd2c5e9 on ABO_FOREIGN_MEMBERS (
+ ADDRESSBOOK_ID
+);
+
+create index SHARED_GROUP_BIND_RES_cf52f95d on SHARED_GROUP_BIND (
+ GROUP_RESOURCE_ID
+);
+
+create index CALENDAR_OBJECT_REVIS_3a3956c4 on CALENDAR_OBJECT_REVISIONS (
+ CALENDAR_HOME_RESOURCE_ID,
+ CALENDAR_RESOURCE_ID
+);
+
+create index CALENDAR_OBJECT_REVIS_6d9d929c on CALENDAR_OBJECT_REVISIONS (
+ CALENDAR_RESOURCE_ID,
+ RESOURCE_NAME,
+ DELETED,
+ REVISION
+);
+
+create index CALENDAR_OBJECT_REVIS_265c8acf on CALENDAR_OBJECT_REVISIONS (
+ CALENDAR_RESOURCE_ID,
+ REVISION
+);
+
+create index ADDRESSBOOK_OBJECT_RE_2bfcf757 on ADDRESSBOOK_OBJECT_REVISIONS (
+ ADDRESSBOOK_HOME_RESOURCE_ID,
+ OWNER_HOME_RESOURCE_ID
+);
+
+create index ADDRESSBOOK_OBJECT_RE_00fe8288 on ADDRESSBOOK_OBJECT_REVISIONS (
+ OWNER_HOME_RESOURCE_ID,
+ RESOURCE_NAME,
+ DELETED,
+ REVISION
+);
+
+create index ADDRESSBOOK_OBJECT_RE_45004780 on ADDRESSBOOK_OBJECT_REVISIONS (
+ OWNER_HOME_RESOURCE_ID,
+ REVISION
+);
+
+create index NOTIFICATION_OBJECT_R_036a9cee on NOTIFICATION_OBJECT_REVISIONS (
+ NOTIFICATION_HOME_RESOURCE_ID,
+ REVISION
+);
+
+create index APN_SUBSCRIPTIONS_RES_9610d78e on APN_SUBSCRIPTIONS (
+ RESOURCE_KEY
+);
+
+create index IMIP_TOKENS_TOKEN_e94b918f on IMIP_TOKENS (
+ TOKEN
+);
+
+create index IMIP_INVITATION_WORK__586d064c on IMIP_INVITATION_WORK (
+ JOB_ID
+);
+
+create index IMIP_POLLING_WORK_JOB_d5535891 on IMIP_POLLING_WORK (
+ JOB_ID
+);
+
+create index IMIP_REPLY_WORK_JOB_I_bf4ae73e on IMIP_REPLY_WORK (
+ JOB_ID
+);
+
+create index PUSH_NOTIFICATION_WOR_8bbab117 on PUSH_NOTIFICATION_WORK (
+ JOB_ID
+);
+
+create index GROUP_CACHER_POLLING__6eb3151c on GROUP_CACHER_POLLING_WORK (
+ JOB_ID
+);
+
+create index GROUP_REFRESH_WORK_JO_717ede20 on GROUP_REFRESH_WORK (
+ JOB_ID
+);
+
+create index GROUPS_GROUP_UID_b35cce23 on GROUPS (
+ GROUP_UID
+);
+
+create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
+ MEMBER_UID
+);
+
+create index GROUP_ATTENDEE_RECONC_da73d3c2 on GROUP_ATTENDEE_RECONCILE_WORK (
+ JOB_ID
+);
+
+create index GROUP_ATTENDEE_RECONC_b894ee7a on GROUP_ATTENDEE_RECONCILE_WORK (
+ RESOURCE_ID
+);
+
+create index GROUP_ATTENDEE_RECONC_5eabc549 on GROUP_ATTENDEE_RECONCILE_WORK (
+ GROUP_ID
+);
+
+create index GROUP_ATTENDEE_RESOUR_855124dc on GROUP_ATTENDEE (
+ RESOURCE_ID
+);
+
+create index GROUP_SHAREE_RECONCIL_9aad0858 on GROUP_SHAREE_RECONCILE_WORK (
+ JOB_ID
+);
+
+create index GROUP_SHAREE_RECONCIL_4dc60f78 on GROUP_SHAREE_RECONCILE_WORK (
+ CALENDAR_ID
+);
+
+create index GROUP_SHAREE_RECONCIL_1d14c921 on GROUP_SHAREE_RECONCILE_WORK (
+ GROUP_ID
+);
+
+create index GROUP_SHAREE_CALENDAR_28a88850 on GROUP_SHAREE (
+ CALENDAR_ID
+);
+
+create index DELEGATE_TO_DELEGATOR_5e149b11 on DELEGATES (
+ DELEGATE,
+ READ_WRITE,
+ DELEGATOR
+);
+
+create index DELEGATE_GROUPS_GROUP_25117446 on DELEGATE_GROUPS (
+ GROUP_ID
+);
+
+create index CALENDAR_OBJECT_SPLIT_af71dcda on CALENDAR_OBJECT_SPLITTER_WORK (
+ RESOURCE_ID
+);
+
+create index CALENDAR_OBJECT_SPLIT_33603b72 on CALENDAR_OBJECT_SPLITTER_WORK (
+ JOB_ID
+);
+
+create index FIND_MIN_VALID_REVISI_78d17400 on FIND_MIN_VALID_REVISION_WORK (
+ JOB_ID
+);
+
+create index REVISION_CLEANUP_WORK_eb062686 on REVISION_CLEANUP_WORK (
+ JOB_ID
+);
+
+create index INBOX_CLEANUP_WORK_JO_799132bd on INBOX_CLEANUP_WORK (
+ JOB_ID
+);
+
+create index CLEANUP_ONE_INBOX_WOR_375dac36 on CLEANUP_ONE_INBOX_WORK (
+ JOB_ID
+);
+
+create index SCHEDULE_WORK_JOB_ID_65e810ee on SCHEDULE_WORK (
+ JOB_ID
+);
+
+create index SCHEDULE_WORK_ICALEND_089f33dc on SCHEDULE_WORK (
+ ICALENDAR_UID
+);
+
+create index SCHEDULE_REFRESH_WORK_26084c7b on SCHEDULE_REFRESH_WORK (
+ HOME_RESOURCE_ID
+);
+
+create index SCHEDULE_REFRESH_WORK_989efe54 on SCHEDULE_REFRESH_WORK (
+ RESOURCE_ID
+);
+
+create index SCHEDULE_REFRESH_ATTE_83053b91 on SCHEDULE_REFRESH_ATTENDEES (
+ RESOURCE_ID,
+ ATTENDEE
+);
+
+create index SCHEDULE_AUTO_REPLY_W_0256478d on SCHEDULE_AUTO_REPLY_WORK (
+ HOME_RESOURCE_ID
+);
+
+create index SCHEDULE_AUTO_REPLY_W_0755e754 on SCHEDULE_AUTO_REPLY_WORK (
+ RESOURCE_ID
+);
+
+create index SCHEDULE_ORGANIZER_WO_18ce4edd on SCHEDULE_ORGANIZER_WORK (
+ HOME_RESOURCE_ID
+);
+
+create index SCHEDULE_ORGANIZER_WO_14702035 on SCHEDULE_ORGANIZER_WORK (
+ RESOURCE_ID
+);
+
+create index SCHEDULE_ORGANIZER_SE_9ec9f827 on SCHEDULE_ORGANIZER_SEND_WORK (
+ HOME_RESOURCE_ID
+);
+
+create index SCHEDULE_ORGANIZER_SE_699fefc4 on SCHEDULE_ORGANIZER_SEND_WORK (
+ RESOURCE_ID
+);
+
+create index SCHEDULE_REPLY_WORK_H_745af8cf on SCHEDULE_REPLY_WORK (
+ HOME_RESOURCE_ID
+);
+
+create index SCHEDULE_REPLY_WORK_R_11bd3fbb on SCHEDULE_REPLY_WORK (
+ RESOURCE_ID
+);
+
+create index SCHEDULE_REPLY_CANCEL_dab513ef on SCHEDULE_REPLY_CANCEL_WORK (
+ HOME_RESOURCE_ID
+);
+
+create index PRINCIPAL_PURGE_POLLI_6383e68a on PRINCIPAL_PURGE_POLLING_WORK (
+ JOB_ID
+);
+
+create index PRINCIPAL_PURGE_CHECK_b0c024c1 on PRINCIPAL_PURGE_CHECK_WORK (
+ JOB_ID
+);
+
+create index PRINCIPAL_PURGE_WORK__7a8141a3 on PRINCIPAL_PURGE_WORK (
+ JOB_ID
+);
+
+create index PRINCIPAL_PURGE_HOME__f35eea7a on PRINCIPAL_PURGE_HOME_WORK (
+ JOB_ID
+);
+
+create index PRINCIPAL_PURGE_HOME__967e4480 on PRINCIPAL_PURGE_HOME_WORK (
+ HOME_RESOURCE_ID
+);
+
+-- Extra schema to add to current-oracle-dialect.sql
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv46sql"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v46.sql (0 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v46.sql (rev 0)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v46.sql 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -0,0 +1,1134 @@
</span><ins>+-- -*- test-case-name: txdav.caldav.datastore.test.test_sql,txdav.carddav.datastore.test.test_sql -*-
+
+----
+-- Copyright (c) 2010-2014 Apple Inc. All rights reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+----
+
+
+-----------------
+-- Resource ID --
+-----------------
+
+create sequence RESOURCE_ID_SEQ;
+
+
+-------------------------
+-- Cluster Bookkeeping --
+-------------------------
+
+-- Information about a process connected to this database.
+
+-- Note that this must match the node info schema in twext.enterprise.queue.
+create table NODE_INFO (
+ HOSTNAME varchar(255) not null,
+ PID integer not null,
+ PORT integer not null,
+ TIME timestamp not null default timezone('UTC', CURRENT_TIMESTAMP),
+
+ primary key (HOSTNAME, PORT)
+);
+
+-- Unique named locks. This table should always be empty, but rows are
+-- temporarily created in order to prevent undesirable concurrency.
+create table NAMED_LOCK (
+ LOCK_NAME varchar(255) primary key
+);
+
+
+--------------------
+-- Jobs --
+--------------------
+
+create sequence JOB_SEQ;
+
+create table JOB (
+ JOB_ID integer primary key default nextval('JOB_SEQ') not null, --implicit index
+ WORK_TYPE varchar(255) not null,
+ PRIORITY integer default 0,
+ WEIGHT integer default 0,
+ NOT_BEFORE timestamp not null,
+ ASSIGNED timestamp default null,
+ OVERDUE timestamp default null,
+ FAILED integer default 0
+);
+
+-------------------
+-- Calendar Home --
+-------------------
+
+create table CALENDAR_HOME (
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
+ OWNER_UID varchar(255) not null unique, -- implicit index
+ STATUS integer default 0 not null, -- enum HOME_STATUS
+ DATAVERSION integer default 0 not null
+);
+
+-- Enumeration of statuses
+
+create table HOME_STATUS (
+ ID integer primary key,
+ DESCRIPTION varchar(16) not null unique
+);
+
+insert into HOME_STATUS values (0, 'normal' );
+insert into HOME_STATUS values (1, 'external');
+insert into HOME_STATUS values (2, 'purging');
+
+
+--------------
+-- Calendar --
+--------------
+
+create table CALENDAR (
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ') -- implicit index
+);
+
+
+----------------------------
+-- Calendar Home Metadata --
+----------------------------
+
+create table CALENDAR_HOME_METADATA (
+ RESOURCE_ID integer primary key references CALENDAR_HOME on delete cascade, -- implicit index
+ QUOTA_USED_BYTES integer default 0 not null,
+ DEFAULT_EVENTS integer default null references CALENDAR on delete set null,
+ DEFAULT_TASKS integer default null references CALENDAR on delete set null,
+ DEFAULT_POLLS integer default null references CALENDAR on delete set null,
+ ALARM_VEVENT_TIMED text default null,
+ ALARM_VEVENT_ALLDAY text default null,
+ ALARM_VTODO_TIMED text default null,
+ ALARM_VTODO_ALLDAY text default null,
+ AVAILABILITY text default null,
+ CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP)
+);
+
+create index CALENDAR_HOME_METADATA_DEFAULT_EVENTS on
+ CALENDAR_HOME_METADATA(DEFAULT_EVENTS);
+create index CALENDAR_HOME_METADATA_DEFAULT_TASKS on
+ CALENDAR_HOME_METADATA(DEFAULT_TASKS);
+create index CALENDAR_HOME_METADATA_DEFAULT_POLLS on
+ CALENDAR_HOME_METADATA(DEFAULT_POLLS);
+
+
+-----------------------
+-- Calendar Metadata --
+-----------------------
+
+create table CALENDAR_METADATA (
+ RESOURCE_ID integer primary key references CALENDAR on delete cascade, -- implicit index
+ SUPPORTED_COMPONENTS varchar(255) default null,
+ CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP)
+);
+
+
+---------------------------
+-- Sharing Notifications --
+---------------------------
+
+create table NOTIFICATION_HOME (
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
+ OWNER_UID varchar(255) not null unique, -- implicit index
+ STATUS integer default 0 not null, -- enum HOME_STATUS
+ DATAVERSION integer default 0 not null
+);
+
+create table NOTIFICATION (
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
+ NOTIFICATION_HOME_RESOURCE_ID integer not null references NOTIFICATION_HOME,
+ NOTIFICATION_UID varchar(255) not null,
+ NOTIFICATION_TYPE varchar(255) not null,
+ NOTIFICATION_DATA text not null,
+ MD5 char(32) not null,
+ CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+
+ unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+);
+
+create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
+ NOTIFICATION(NOTIFICATION_HOME_RESOURCE_ID);
+
+
+-------------------
+-- Calendar Bind --
+-------------------
+
+-- Joins CALENDAR_HOME and CALENDAR
+
+create table CALENDAR_BIND (
+ CALENDAR_HOME_RESOURCE_ID integer not null references CALENDAR_HOME,
+ CALENDAR_RESOURCE_ID integer not null references CALENDAR on delete cascade,
+ EXTERNAL_ID integer default null,
+ CALENDAR_RESOURCE_NAME varchar(255) not null,
+ BIND_MODE integer not null, -- enum CALENDAR_BIND_MODE
+ BIND_STATUS integer not null, -- enum CALENDAR_BIND_STATUS
+ BIND_REVISION integer default 0 not null,
+ MESSAGE text,
+ TRANSP integer default 0 not null, -- enum CALENDAR_TRANSP
+ ALARM_VEVENT_TIMED text default null,
+ ALARM_VEVENT_ALLDAY text default null,
+ ALARM_VTODO_TIMED text default null,
+ ALARM_VTODO_ALLDAY text default null,
+ TIMEZONE text default null,
+
+ primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
+);
+
+create index CALENDAR_BIND_RESOURCE_ID on
+ CALENDAR_BIND(CALENDAR_RESOURCE_ID);
+
+-- Enumeration of calendar bind modes
+
+create table CALENDAR_BIND_MODE (
+ ID integer primary key,
+ DESCRIPTION varchar(16) not null unique
+);
+
+insert into CALENDAR_BIND_MODE values (0, 'own' );
+insert into CALENDAR_BIND_MODE values (1, 'read' );
+insert into CALENDAR_BIND_MODE values (2, 'write');
+insert into CALENDAR_BIND_MODE values (3, 'direct');
+insert into CALENDAR_BIND_MODE values (4, 'indirect');
+insert into CALENDAR_BIND_MODE values (5, 'group');
+insert into CALENDAR_BIND_MODE values (6, 'group_read');
+insert into CALENDAR_BIND_MODE values (7, 'group_write');
+
+-- Enumeration of statuses
+
+create table CALENDAR_BIND_STATUS (
+ ID integer primary key,
+ DESCRIPTION varchar(16) not null unique
+);
+
+insert into CALENDAR_BIND_STATUS values (0, 'invited' );
+insert into CALENDAR_BIND_STATUS values (1, 'accepted');
+insert into CALENDAR_BIND_STATUS values (2, 'declined');
+insert into CALENDAR_BIND_STATUS values (3, 'invalid');
+insert into CALENDAR_BIND_STATUS values (4, 'deleted');
+
+
+-- Enumeration of transparency
+
+create table CALENDAR_TRANSP (
+ ID integer primary key,
+ DESCRIPTION varchar(16) not null unique
+);
+
+insert into CALENDAR_TRANSP values (0, 'opaque' );
+insert into CALENDAR_TRANSP values (1, 'transparent');
+
+
+---------------------
+-- Calendar Object --
+---------------------
+
+create table CALENDAR_OBJECT (
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
+ CALENDAR_RESOURCE_ID integer not null references CALENDAR on delete cascade,
+ RESOURCE_NAME varchar(255) not null,
+ ICALENDAR_TEXT text not null,
+ ICALENDAR_UID varchar(255) not null,
+ ICALENDAR_TYPE varchar(255) not null,
+ ATTACHMENTS_MODE integer default 0 not null, -- enum CALENDAR_OBJ_ATTACHMENTS_MODE
+ DROPBOX_ID varchar(255),
+ ORGANIZER varchar(255),
+ RECURRANCE_MIN date, -- minimum date that recurrences have been expanded to.
+ RECURRANCE_MAX date, -- maximum date that recurrences have been expanded to.
+ ACCESS integer default 0 not null,
+ SCHEDULE_OBJECT boolean default false,
+ SCHEDULE_TAG varchar(36) default null,
+ SCHEDULE_ETAGS text default null,
+ PRIVATE_COMMENTS boolean default false not null,
+ MD5 char(32) not null,
+ CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ DATAVERSION integer default 0 not null,
+
+ unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+
+ -- since the 'inbox' is a 'calendar resource' for the purpose of storing
+ -- calendar objects, this constraint has to be selectively enforced by the
+ -- application layer.
+
+ -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+);
+
+create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
+ CALENDAR_OBJECT(CALENDAR_RESOURCE_ID, ICALENDAR_UID);
+
+create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_RECURRANCE_MAX on
+ CALENDAR_OBJECT(CALENDAR_RESOURCE_ID, RECURRANCE_MAX);
+
+create index CALENDAR_OBJECT_ICALENDAR_UID on
+ CALENDAR_OBJECT(ICALENDAR_UID);
+
+create index CALENDAR_OBJECT_DROPBOX_ID on
+ CALENDAR_OBJECT(DROPBOX_ID);
+
+-- Enumeration of attachment modes
+
+create table CALENDAR_OBJ_ATTACHMENTS_MODE (
+ ID integer primary key,
+ DESCRIPTION varchar(16) not null unique
+);
+
+insert into CALENDAR_OBJ_ATTACHMENTS_MODE values (0, 'none' );
+insert into CALENDAR_OBJ_ATTACHMENTS_MODE values (1, 'read' );
+insert into CALENDAR_OBJ_ATTACHMENTS_MODE values (2, 'write');
+
+
+-- Enumeration of calendar access types
+
+create table CALENDAR_ACCESS_TYPE (
+ ID integer primary key,
+ DESCRIPTION varchar(32) not null unique
+);
+
+insert into CALENDAR_ACCESS_TYPE values (0, '' );
+insert into CALENDAR_ACCESS_TYPE values (1, 'public' );
+insert into CALENDAR_ACCESS_TYPE values (2, 'private' );
+insert into CALENDAR_ACCESS_TYPE values (3, 'confidential' );
+insert into CALENDAR_ACCESS_TYPE values (4, 'restricted' );
+
+
+-----------------
+-- Instance ID --
+-----------------
+
+create sequence INSTANCE_ID_SEQ;
+
+
+----------------
+-- Time Range --
+----------------
+
+create table TIME_RANGE (
+ INSTANCE_ID integer primary key default nextval('INSTANCE_ID_SEQ'), -- implicit index
+ CALENDAR_RESOURCE_ID integer not null references CALENDAR on delete cascade,
+ CALENDAR_OBJECT_RESOURCE_ID integer not null references CALENDAR_OBJECT on delete cascade,
+ FLOATING boolean not null,
+ START_DATE timestamp not null,
+ END_DATE timestamp not null,
+ FBTYPE integer not null,
+ TRANSPARENT boolean not null
+);
+
+create index TIME_RANGE_CALENDAR_RESOURCE_ID on
+ TIME_RANGE(CALENDAR_RESOURCE_ID);
+create index TIME_RANGE_CALENDAR_OBJECT_RESOURCE_ID on
+ TIME_RANGE(CALENDAR_OBJECT_RESOURCE_ID);
+
+
+-- Enumeration of free/busy types
+
+create table FREE_BUSY_TYPE (
+ ID integer primary key,
+ DESCRIPTION varchar(16) not null unique
+);
+
+insert into FREE_BUSY_TYPE values (0, 'unknown' );
+insert into FREE_BUSY_TYPE values (1, 'free' );
+insert into FREE_BUSY_TYPE values (2, 'busy' );
+insert into FREE_BUSY_TYPE values (3, 'busy-unavailable');
+insert into FREE_BUSY_TYPE values (4, 'busy-tentative' );
+
+
+-------------------
+-- Per-user data --
+-------------------
+
+create table PERUSER (
+ TIME_RANGE_INSTANCE_ID integer not null references TIME_RANGE on delete cascade,
+ USER_ID varchar(255) not null,
+ TRANSPARENT boolean not null,
+ ADJUSTED_START_DATE timestamp default null,
+ ADJUSTED_END_DATE timestamp default null
+);
+
+create index PERUSER_TIME_RANGE_INSTANCE_ID on
+ PERUSER(TIME_RANGE_INSTANCE_ID);
+
+
+----------------
+-- Attachment --
+----------------
+
+create sequence ATTACHMENT_ID_SEQ;
+
+create table ATTACHMENT (
+ ATTACHMENT_ID integer primary key default nextval('ATTACHMENT_ID_SEQ'), -- implicit index
+ CALENDAR_HOME_RESOURCE_ID integer not null references CALENDAR_HOME,
+ DROPBOX_ID varchar(255),
+ CONTENT_TYPE varchar(255) not null,
+ SIZE integer not null,
+ MD5 char(32) not null,
+ CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ PATH varchar(1024) not null
+);
+
+create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
+ ATTACHMENT(CALENDAR_HOME_RESOURCE_ID);
+
+create index ATTACHMENT_DROPBOX_ID on
+ ATTACHMENT(DROPBOX_ID);
+
+-- Many-to-many relationship between attachments and calendar objects
+create table ATTACHMENT_CALENDAR_OBJECT (
+ ATTACHMENT_ID integer not null references ATTACHMENT on delete cascade,
+ MANAGED_ID varchar(255) not null,
+ CALENDAR_OBJECT_RESOURCE_ID integer not null references CALENDAR_OBJECT on delete cascade,
+
+ primary key (ATTACHMENT_ID, CALENDAR_OBJECT_RESOURCE_ID), -- implicit index
+ unique (MANAGED_ID, CALENDAR_OBJECT_RESOURCE_ID) --implicit index
+);
+
+create index ATTACHMENT_CALENDAR_OBJECT_CALENDAR_OBJECT_RESOURCE_ID on
+ ATTACHMENT_CALENDAR_OBJECT(CALENDAR_OBJECT_RESOURCE_ID);
+
+-----------------------
+-- Resource Property --
+-----------------------
+
+create table RESOURCE_PROPERTY (
+ RESOURCE_ID integer not null, -- foreign key: *.RESOURCE_ID
+ NAME varchar(255) not null,
+ VALUE text not null, -- FIXME: xml?
+ VIEWER_UID varchar(255),
+
+ primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
+);
+
+
+----------------------
+-- AddressBook Home --
+----------------------
+
+create table ADDRESSBOOK_HOME (
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
+ ADDRESSBOOK_PROPERTY_STORE_ID integer default nextval('RESOURCE_ID_SEQ') not null, -- implicit index
+ OWNER_UID varchar(255) not null unique, -- implicit index
+ STATUS integer default 0 not null, -- enum HOME_STATUS
+ DATAVERSION integer default 0 not null
+);
+
+
+-------------------------------
+-- AddressBook Home Metadata --
+-------------------------------
+
+create table ADDRESSBOOK_HOME_METADATA (
+ RESOURCE_ID integer primary key references ADDRESSBOOK_HOME on delete cascade, -- implicit index
+ QUOTA_USED_BYTES integer default 0 not null,
+ CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP)
+);
+
+
+-----------------------------
+-- Shared AddressBook Bind --
+-----------------------------
+
+-- Joins sharee ADDRESSBOOK_HOME and owner ADDRESSBOOK_HOME
+
+create table SHARED_ADDRESSBOOK_BIND (
+ ADDRESSBOOK_HOME_RESOURCE_ID integer not null references ADDRESSBOOK_HOME,
+ OWNER_HOME_RESOURCE_ID integer not null references ADDRESSBOOK_HOME on delete cascade,
+ EXTERNAL_ID integer default null,
+ ADDRESSBOOK_RESOURCE_NAME varchar(255) not null,
+ BIND_MODE integer not null, -- enum CALENDAR_BIND_MODE
+ BIND_STATUS integer not null, -- enum CALENDAR_BIND_STATUS
+ BIND_REVISION integer default 0 not null,
+ MESSAGE text, -- FIXME: xml?
+
+ primary key (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID), -- implicit index
+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
+);
+
+create index SHARED_ADDRESSBOOK_BIND_RESOURCE_ID on
+ SHARED_ADDRESSBOOK_BIND(OWNER_HOME_RESOURCE_ID);
+
+
+------------------------
+-- AddressBook Object --
+------------------------
+
+create table ADDRESSBOOK_OBJECT (
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
+ ADDRESSBOOK_HOME_RESOURCE_ID integer not null references ADDRESSBOOK_HOME on delete cascade,
+ RESOURCE_NAME varchar(255) not null,
+ VCARD_TEXT text not null,
+ VCARD_UID varchar(255) not null,
+ KIND integer not null, -- enum ADDRESSBOOK_OBJECT_KIND
+ MD5 char(32) not null,
+ CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ DATAVERSION integer default 0 not null,
+
+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, VCARD_UID) -- implicit index
+);
+
+
+-----------------------------
+-- AddressBook Object kind --
+-----------------------------
+
+create table ADDRESSBOOK_OBJECT_KIND (
+ ID integer primary key,
+ DESCRIPTION varchar(16) not null unique
+);
+
+insert into ADDRESSBOOK_OBJECT_KIND values (0, 'person');
+insert into ADDRESSBOOK_OBJECT_KIND values (1, 'group' );
+insert into ADDRESSBOOK_OBJECT_KIND values (2, 'resource');
+insert into ADDRESSBOOK_OBJECT_KIND values (3, 'location');
+
+
+----------------------------------
+-- Revisions, forward reference --
+----------------------------------
+
+create sequence REVISION_SEQ;
+
+---------------------------------
+-- Address Book Object Members --
+---------------------------------
+
+create table ABO_MEMBERS (
+ GROUP_ID integer not null, -- references ADDRESSBOOK_OBJECT on delete cascade, -- AddressBook Object's (kind=='group') RESOURCE_ID
+ ADDRESSBOOK_ID integer not null references ADDRESSBOOK_HOME on delete cascade,
+ MEMBER_ID integer not null, -- references ADDRESSBOOK_OBJECT, -- member AddressBook Object's RESOURCE_ID
+ REVISION integer default nextval('REVISION_SEQ') not null,
+ REMOVED boolean default false not null,
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+
+ primary key (GROUP_ID, MEMBER_ID, REVISION) -- implicit index
+);
+
+create index ABO_MEMBERS_ADDRESSBOOK_ID on
+ ABO_MEMBERS(ADDRESSBOOK_ID);
+create index ABO_MEMBERS_MEMBER_ID on
+ ABO_MEMBERS(MEMBER_ID);
+
+------------------------------------------
+-- Address Book Object Foreign Members --
+------------------------------------------
+
+create table ABO_FOREIGN_MEMBERS (
+ GROUP_ID integer not null references ADDRESSBOOK_OBJECT on delete cascade, -- AddressBook Object's (kind=='group') RESOURCE_ID
+ ADDRESSBOOK_ID integer not null references ADDRESSBOOK_HOME on delete cascade,
+ MEMBER_ADDRESS varchar(255) not null, -- member AddressBook Object's 'calendar' address
+
+ primary key (GROUP_ID, MEMBER_ADDRESS) -- implicit index
+);
+
+create index ABO_FOREIGN_MEMBERS_ADDRESSBOOK_ID on
+ ABO_FOREIGN_MEMBERS(ADDRESSBOOK_ID);
+
+-----------------------
+-- Shared Group Bind --
+-----------------------
+
+-- Joins ADDRESSBOOK_HOME and ADDRESSBOOK_OBJECT (kind == group)
+
+create table SHARED_GROUP_BIND (
+ ADDRESSBOOK_HOME_RESOURCE_ID integer not null references ADDRESSBOOK_HOME,
+ GROUP_RESOURCE_ID integer not null references ADDRESSBOOK_OBJECT on delete cascade,
+ EXTERNAL_ID integer default null,
+ GROUP_ADDRESSBOOK_NAME varchar(255) not null,
+ BIND_MODE integer not null, -- enum CALENDAR_BIND_MODE
+ BIND_STATUS integer not null, -- enum CALENDAR_BIND_STATUS
+ BIND_REVISION integer default 0 not null,
+ MESSAGE text, -- FIXME: xml?
+
+ primary key (ADDRESSBOOK_HOME_RESOURCE_ID, GROUP_RESOURCE_ID), -- implicit index
+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, GROUP_ADDRESSBOOK_NAME) -- implicit index
+);
+
+create index SHARED_GROUP_BIND_RESOURCE_ID on
+ SHARED_GROUP_BIND(GROUP_RESOURCE_ID);
+
+
+---------------
+-- Revisions --
+---------------
+
+-- create sequence REVISION_SEQ;
+
+
+-------------------------------
+-- Calendar Object Revisions --
+-------------------------------
+
+create table CALENDAR_OBJECT_REVISIONS (
+ CALENDAR_HOME_RESOURCE_ID integer not null references CALENDAR_HOME,
+ CALENDAR_RESOURCE_ID integer references CALENDAR,
+ CALENDAR_NAME varchar(255) default null,
+ RESOURCE_NAME varchar(255),
+ REVISION integer default nextval('REVISION_SEQ') not null,
+ DELETED boolean not null,
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP)
+);
+
+create index CALENDAR_OBJECT_REVISIONS_HOME_RESOURCE_ID_CALENDAR_RESOURCE_ID
+ on CALENDAR_OBJECT_REVISIONS(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID);
+
+create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
+ on CALENDAR_OBJECT_REVISIONS(CALENDAR_RESOURCE_ID, RESOURCE_NAME, DELETED, REVISION);
+
+create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_REVISION
+ on CALENDAR_OBJECT_REVISIONS(CALENDAR_RESOURCE_ID, REVISION);
+
+
+----------------------------------
+-- AddressBook Object Revisions --
+----------------------------------
+
+create table ADDRESSBOOK_OBJECT_REVISIONS (
+ ADDRESSBOOK_HOME_RESOURCE_ID integer not null references ADDRESSBOOK_HOME,
+ OWNER_HOME_RESOURCE_ID integer references ADDRESSBOOK_HOME,
+ ADDRESSBOOK_NAME varchar(255) default null,
+ OBJECT_RESOURCE_ID integer default 0,
+ RESOURCE_NAME varchar(255),
+ REVISION integer default nextval('REVISION_SEQ') not null,
+ DELETED boolean not null,
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP)
+);
+
+create index ADDRESSBOOK_OBJECT_REVISIONS_HOME_RESOURCE_ID_OWNER_HOME_RESOURCE_ID
+ on ADDRESSBOOK_OBJECT_REVISIONS(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID);
+
+create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
+ on ADDRESSBOOK_OBJECT_REVISIONS(OWNER_HOME_RESOURCE_ID, RESOURCE_NAME, DELETED, REVISION);
+
+create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_REVISION
+ on ADDRESSBOOK_OBJECT_REVISIONS(OWNER_HOME_RESOURCE_ID, REVISION);
+
+
+-----------------------------------
+-- Notification Object Revisions --
+-----------------------------------
+
+create table NOTIFICATION_OBJECT_REVISIONS (
+ NOTIFICATION_HOME_RESOURCE_ID integer not null references NOTIFICATION_HOME on delete cascade,
+ RESOURCE_NAME varchar(255),
+ REVISION integer default nextval('REVISION_SEQ') not null,
+ DELETED boolean not null,
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+
+ unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+);
+
+create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
+ on NOTIFICATION_OBJECT_REVISIONS(NOTIFICATION_HOME_RESOURCE_ID, REVISION);
+
+
+-------------------------------------------
+-- Apple Push Notification Subscriptions --
+-------------------------------------------
+
+create table APN_SUBSCRIPTIONS (
+ TOKEN varchar(255) not null,
+ RESOURCE_KEY varchar(255) not null,
+ MODIFIED integer not null,
+ SUBSCRIBER_GUID varchar(255) not null,
+ USER_AGENT varchar(255) default null,
+ IP_ADDR varchar(255) default null,
+
+ primary key (TOKEN, RESOURCE_KEY) -- implicit index
+);
+
+create index APN_SUBSCRIPTIONS_RESOURCE_KEY
+ on APN_SUBSCRIPTIONS(RESOURCE_KEY);
+
+
+-----------------
+-- IMIP Tokens --
+-----------------
+
+create table IMIP_TOKENS (
+ TOKEN varchar(255) not null,
+ ORGANIZER varchar(255) not null,
+ ATTENDEE varchar(255) not null,
+ ICALUID varchar(255) not null,
+ ACCESSED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+
+ primary key (ORGANIZER, ATTENDEE, ICALUID) -- implicit index
+);
+
+create index IMIP_TOKENS_TOKEN
+ on IMIP_TOKENS(TOKEN);
+
+
+----------------
+-- Work Items --
+----------------
+
+create sequence WORKITEM_SEQ;
+
+
+---------------------------
+-- IMIP Inivitation Work --
+---------------------------
+
+create table IMIP_INVITATION_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null,
+ FROM_ADDR varchar(255) not null,
+ TO_ADDR varchar(255) not null,
+ ICALENDAR_TEXT text not null
+);
+
+create index IMIP_INVITATION_WORK_JOB_ID on
+ IMIP_INVITATION_WORK(JOB_ID);
+
+-----------------------
+-- IMIP Polling Work --
+-----------------------
+
+create table IMIP_POLLING_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null
+);
+
+create index IMIP_POLLING_WORK_JOB_ID on
+ IMIP_POLLING_WORK(JOB_ID);
+
+
+---------------------
+-- IMIP Reply Work --
+---------------------
+
+create table IMIP_REPLY_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null,
+ ORGANIZER varchar(255) not null,
+ ATTENDEE varchar(255) not null,
+ ICALENDAR_TEXT text not null
+);
+
+create index IMIP_REPLY_WORK_JOB_ID on
+ IMIP_REPLY_WORK(JOB_ID);
+
+
+------------------------
+-- Push Notifications --
+------------------------
+
+create table PUSH_NOTIFICATION_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null,
+ PUSH_ID varchar(255) not null,
+ PUSH_PRIORITY integer not null -- 1:low 5:medium 10:high
+);
+
+create index PUSH_NOTIFICATION_WORK_JOB_ID on
+ PUSH_NOTIFICATION_WORK(JOB_ID);
+
+-----------------
+-- GroupCacher --
+-----------------
+
+create table GROUP_CACHER_POLLING_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null
+);
+
+create index GROUP_CACHER_POLLING_WORK_JOB_ID on
+ GROUP_CACHER_POLLING_WORK(JOB_ID);
+
+create table GROUP_REFRESH_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null,
+ GROUP_UID varchar(255) not null
+);
+
+create index GROUP_REFRESH_WORK_JOB_ID on
+ GROUP_REFRESH_WORK(JOB_ID);
+
+create table GROUPS (
+ GROUP_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
+ NAME varchar(255) not null,
+ GROUP_UID varchar(255) not null,
+ MEMBERSHIP_HASH varchar(255) not null,
+ EXTANT integer default 1,
+ CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP)
+);
+create index GROUPS_GROUP_UID on
+ GROUPS(GROUP_UID);
+
+create table GROUP_MEMBERSHIP (
+ GROUP_ID integer not null references GROUPS on delete cascade,
+ MEMBER_UID varchar(255) not null,
+
+ primary key (GROUP_ID, MEMBER_UID)
+);
+
+create index GROUP_MEMBERSHIP_MEMBER on
+ GROUP_MEMBERSHIP(MEMBER_UID);
+
+create table GROUP_ATTENDEE_RECONCILE_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer not null references JOB,
+ RESOURCE_ID integer not null references CALENDAR_OBJECT on delete cascade,
+ GROUP_ID integer not null references GROUPS on delete cascade
+);
+
+create index GROUP_ATTENDEE_RECONCILE_WORK_JOB_ID on
+ GROUP_ATTENDEE_RECONCILE_WORK(JOB_ID);
+create index GROUP_ATTENDEE_RECONCILE_WORK_RESOURCE_ID on
+ GROUP_ATTENDEE_RECONCILE_WORK(RESOURCE_ID);
+create index GROUP_ATTENDEE_RECONCILE_WORK_GROUP_ID on
+ GROUP_ATTENDEE_RECONCILE_WORK(GROUP_ID);
+
+
+create table GROUP_ATTENDEE (
+ GROUP_ID integer not null references GROUPS on delete cascade,
+ RESOURCE_ID integer not null references CALENDAR_OBJECT on delete cascade,
+ MEMBERSHIP_HASH varchar(255) not null,
+
+ primary key (GROUP_ID, RESOURCE_ID)
+);
+
+create index GROUP_ATTENDEE_RESOURCE_ID on
+ GROUP_ATTENDEE(RESOURCE_ID);
+
+
+create table GROUP_SHAREE_RECONCILE_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer not null references JOB,
+ CALENDAR_ID integer not null references CALENDAR on delete cascade,
+ GROUP_ID integer not null references GROUPS on delete cascade
+);
+
+create index GROUP_SHAREE_RECONCILE_WORK_JOB_ID on
+ GROUP_SHAREE_RECONCILE_WORK(JOB_ID);
+create index GROUP_SHAREE_RECONCILE_WORK_CALENDAR_ID on
+ GROUP_SHAREE_RECONCILE_WORK(CALENDAR_ID);
+create index GROUP_SHAREE_RECONCILE_WORK_GROUP_ID on
+ GROUP_SHAREE_RECONCILE_WORK(GROUP_ID);
+
+
+create table GROUP_SHAREE (
+ GROUP_ID integer not null references GROUPS on delete cascade,
+ CALENDAR_ID integer not null references CALENDAR on delete cascade,
+ GROUP_BIND_MODE integer not null, -- enum CALENDAR_BIND_MODE
+ MEMBERSHIP_HASH varchar(255) not null,
+
+ primary key (GROUP_ID, CALENDAR_ID)
+);
+
+create index GROUP_SHAREE_CALENDAR_ID on
+ GROUP_SHAREE(CALENDAR_ID);
+
+---------------
+-- Delegates --
+---------------
+
+create table DELEGATES (
+ DELEGATOR varchar(255) not null,
+ DELEGATE varchar(255) not null,
+ READ_WRITE integer not null, -- 1 = ReadWrite, 0 = ReadOnly
+
+ primary key (DELEGATOR, READ_WRITE, DELEGATE)
+);
+create index DELEGATE_TO_DELEGATOR on
+ DELEGATES(DELEGATE, READ_WRITE, DELEGATOR);
+
+create table DELEGATE_GROUPS (
+ DELEGATOR varchar(255) not null,
+ GROUP_ID integer not null references GROUPS on delete cascade,
+ READ_WRITE integer not null, -- 1 = ReadWrite, 0 = ReadOnly
+ IS_EXTERNAL integer not null, -- 1 = ReadWrite, 0 = ReadOnly
+
+ primary key (DELEGATOR, READ_WRITE, GROUP_ID)
+);
+create index DELEGATE_GROUPS_GROUP_ID on
+ DELEGATE_GROUPS(GROUP_ID);
+
+create table EXTERNAL_DELEGATE_GROUPS (
+ DELEGATOR varchar(255) primary key not null,
+ GROUP_UID_READ varchar(255),
+ GROUP_UID_WRITE varchar(255)
+);
+
+--------------------------
+-- Object Splitter Work --
+--------------------------
+
+create table CALENDAR_OBJECT_SPLITTER_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null,
+ RESOURCE_ID integer not null references CALENDAR_OBJECT on delete cascade
+);
+
+create index CALENDAR_OBJECT_SPLITTER_WORK_RESOURCE_ID on
+ CALENDAR_OBJECT_SPLITTER_WORK(RESOURCE_ID);
+create index CALENDAR_OBJECT_SPLITTER_WORK_JOB_ID on
+ CALENDAR_OBJECT_SPLITTER_WORK(JOB_ID);
+
+---------------------------
+-- Revision Cleanup Work --
+---------------------------
+
+create table FIND_MIN_VALID_REVISION_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null
+);
+
+create index FIND_MIN_VALID_REVISION_WORK_JOB_ID on
+ FIND_MIN_VALID_REVISION_WORK(JOB_ID);
+
+create table REVISION_CLEANUP_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null
+);
+
+create index REVISION_CLEANUP_WORK_JOB_ID on
+ REVISION_CLEANUP_WORK(JOB_ID);
+
+------------------------
+-- Inbox Cleanup Work --
+------------------------
+
+create table INBOX_CLEANUP_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null
+);
+
+create index INBOX_CLEANUP_WORK_JOB_ID on
+ INBOX_CLEANUP_WORK(JOB_ID);
+
+create table CLEANUP_ONE_INBOX_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null,
+ HOME_ID integer not null unique references CALENDAR_HOME on delete cascade
+);
+
+create index CLEANUP_ONE_INBOX_WORK_JOB_ID on
+ CLEANUP_ONE_INBOX_WORK(JOB_ID);
+
+-------------------
+-- Schedule Work --
+-------------------
+
+create table SCHEDULE_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null,
+ ICALENDAR_UID varchar(255) not null,
+ WORK_TYPE varchar(255) not null
+);
+
+create index SCHEDULE_WORK_JOB_ID on
+ SCHEDULE_WORK(JOB_ID);
+create index SCHEDULE_WORK_ICALENDAR_UID on
+ SCHEDULE_WORK(ICALENDAR_UID);
+
+---------------------------
+-- Schedule Refresh Work --
+---------------------------
+
+create table SCHEDULE_REFRESH_WORK (
+ WORK_ID integer primary key references SCHEDULE_WORK on delete cascade, -- implicit index
+ HOME_RESOURCE_ID integer not null references CALENDAR_HOME on delete cascade,
+ RESOURCE_ID integer not null references CALENDAR_OBJECT on delete cascade,
+ ATTENDEE_COUNT integer
+);
+
+create index SCHEDULE_REFRESH_WORK_HOME_RESOURCE_ID on
+ SCHEDULE_REFRESH_WORK(HOME_RESOURCE_ID);
+create index SCHEDULE_REFRESH_WORK_RESOURCE_ID on
+ SCHEDULE_REFRESH_WORK(RESOURCE_ID);
+
+create table SCHEDULE_REFRESH_ATTENDEES (
+ RESOURCE_ID integer not null references CALENDAR_OBJECT on delete cascade,
+ ATTENDEE varchar(255) not null,
+
+ primary key (RESOURCE_ID, ATTENDEE)
+);
+
+create index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE on
+ SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
+
+------------------------------
+-- Schedule Auto Reply Work --
+------------------------------
+
+create table SCHEDULE_AUTO_REPLY_WORK (
+ WORK_ID integer primary key references SCHEDULE_WORK on delete cascade, -- implicit index
+ HOME_RESOURCE_ID integer not null references CALENDAR_HOME on delete cascade,
+ RESOURCE_ID integer not null references CALENDAR_OBJECT on delete cascade,
+ PARTSTAT varchar(255) not null
+);
+
+create index SCHEDULE_AUTO_REPLY_WORK_HOME_RESOURCE_ID on
+ SCHEDULE_AUTO_REPLY_WORK(HOME_RESOURCE_ID);
+create index SCHEDULE_AUTO_REPLY_WORK_RESOURCE_ID on
+ SCHEDULE_AUTO_REPLY_WORK(RESOURCE_ID);
+
+-----------------------------
+-- Schedule Organizer Work --
+-----------------------------
+
+create table SCHEDULE_ORGANIZER_WORK (
+ WORK_ID integer primary key references SCHEDULE_WORK on delete cascade, -- implicit index
+ SCHEDULE_ACTION integer not null, -- Enum SCHEDULE_ACTION
+ HOME_RESOURCE_ID integer not null references CALENDAR_HOME on delete cascade,
+ RESOURCE_ID integer, -- this references a possibly non-existent CALENDR_OBJECT
+ ICALENDAR_TEXT_OLD text,
+ ICALENDAR_TEXT_NEW text,
+ ATTENDEE_COUNT integer,
+ SMART_MERGE boolean
+);
+
+create index SCHEDULE_ORGANIZER_WORK_HOME_RESOURCE_ID on
+ SCHEDULE_ORGANIZER_WORK(HOME_RESOURCE_ID);
+create index SCHEDULE_ORGANIZER_WORK_RESOURCE_ID on
+ SCHEDULE_ORGANIZER_WORK(RESOURCE_ID);
+
+-- Enumeration of schedule actions
+
+create table SCHEDULE_ACTION (
+ ID integer primary key,
+ DESCRIPTION varchar(16) not null unique
+);
+
+insert into SCHEDULE_ACTION values (0, 'create');
+insert into SCHEDULE_ACTION values (1, 'modify');
+insert into SCHEDULE_ACTION values (2, 'modify-cancelled');
+insert into SCHEDULE_ACTION values (3, 'remove');
+
+----------------------------------
+-- Schedule Organizer Send Work --
+----------------------------------
+
+create table SCHEDULE_ORGANIZER_SEND_WORK (
+ WORK_ID integer primary key references SCHEDULE_WORK on delete cascade, -- implicit index
+ SCHEDULE_ACTION integer not null, -- Enum SCHEDULE_ACTION
+ HOME_RESOURCE_ID integer not null references CALENDAR_HOME on delete cascade,
+ RESOURCE_ID integer, -- this references a possibly non-existent CALENDAR_OBJECT
+ ATTENDEE varchar(255) not null,
+ ITIP_MSG text,
+ NO_REFRESH boolean
+);
+
+create index SCHEDULE_ORGANIZER_SEND_WORK_HOME_RESOURCE_ID on
+ SCHEDULE_ORGANIZER_SEND_WORK(HOME_RESOURCE_ID);
+create index SCHEDULE_ORGANIZER_SEND_WORK_RESOURCE_ID on
+ SCHEDULE_ORGANIZER_SEND_WORK(RESOURCE_ID);
+
+-------------------------
+-- Schedule Reply Work --
+-------------------------
+
+create table SCHEDULE_REPLY_WORK (
+ WORK_ID integer primary key references SCHEDULE_WORK on delete cascade, -- implicit index
+ HOME_RESOURCE_ID integer not null references CALENDAR_HOME on delete cascade,
+ RESOURCE_ID integer not null references CALENDAR_OBJECT on delete cascade,
+ CHANGED_RIDS text
+);
+
+create index SCHEDULE_REPLY_WORK_HOME_RESOURCE_ID on
+ SCHEDULE_REPLY_WORK(HOME_RESOURCE_ID);
+create index SCHEDULE_REPLY_WORK_RESOURCE_ID on
+ SCHEDULE_REPLY_WORK(RESOURCE_ID);
+
+--------------------------------
+-- Schedule Reply Cancel Work --
+--------------------------------
+
+create table SCHEDULE_REPLY_CANCEL_WORK (
+ WORK_ID integer primary key references SCHEDULE_WORK on delete cascade, -- implicit index
+ HOME_RESOURCE_ID integer not null references CALENDAR_HOME on delete cascade,
+ ICALENDAR_TEXT text not null
+);
+
+create index SCHEDULE_REPLY_CANCEL_WORK_HOME_RESOURCE_ID on
+ SCHEDULE_REPLY_CANCEL_WORK(HOME_RESOURCE_ID);
+
+----------------------------------
+-- Principal Purge Polling Work --
+----------------------------------
+
+create table PRINCIPAL_PURGE_POLLING_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null
+);
+
+create index PRINCIPAL_PURGE_POLLING_WORK_JOB_ID on
+ PRINCIPAL_PURGE_POLLING_WORK(JOB_ID);
+
+--------------------------------
+-- Principal Purge Check Work --
+--------------------------------
+
+create table PRINCIPAL_PURGE_CHECK_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null,
+ UID varchar(255) not null
+);
+
+create index PRINCIPAL_PURGE_CHECK_WORK_JOB_ID on
+ PRINCIPAL_PURGE_CHECK_WORK(JOB_ID);
+
+--------------------------
+-- Principal Purge Work --
+--------------------------
+
+create table PRINCIPAL_PURGE_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null,
+ UID varchar(255) not null
+);
+
+create index PRINCIPAL_PURGE_WORK_JOB_ID on
+ PRINCIPAL_PURGE_WORK(JOB_ID);
+
+
+--------------------------------
+-- Principal Home Remove Work --
+--------------------------------
+
+create table PRINCIPAL_PURGE_HOME_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null,
+ HOME_RESOURCE_ID integer not null references CALENDAR_HOME on delete cascade
+);
+
+create index PRINCIPAL_PURGE_HOME_WORK_JOB_ID on
+ PRINCIPAL_PURGE_HOME_WORK(JOB_ID);
+create index PRINCIPAL_PURGE_HOME_HOME_RESOURCE_ID on
+ PRINCIPAL_PURGE_HOME_WORK(HOME_RESOURCE_ID);
+
+
+--------------------
+-- Schema Version --
+--------------------
+
+create table CALENDARSERVER (
+ NAME varchar(255) primary key, -- implicit index
+ VALUE varchar(255)
+);
+
+insert into CALENDARSERVER values ('VERSION', '46');
+insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '6');
+insert into CALENDARSERVER values ('ADDRESSBOOK-DATAVERSION', '2');
+insert into CALENDARSERVER values ('NOTIFICATION-DATAVERSION', '1');
+insert into CALENDARSERVER values ('MIN-VALID-REVISION', '1');
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_46_to_47sql"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_46_to_47.sql (0 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_46_to_47.sql (rev 0)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_46_to_47.sql 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+----
+-- Copyright (c) 2012-2014 Apple Inc. All rights reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+----
+
+---------------------------------------------------
+-- Upgrade database schema from VERSION 46 to 47 --
+---------------------------------------------------
+
+
+create table GROUP_DELEGATE_CHANGES_WORK (
+ "WORK_ID" integer primary key not null,
+ "JOB_ID" integer not null references JOB,
+ "DELEGATOR_UID" nvarchar2(255),
+ "READ_DELEGATE_UID" nvarchar2(255),
+ "WRITE_DELEGATE_UID" nvarchar2(255)
+);
+
+create index GROUP_DELEGATE_CHANGE_8bf9e6d8 on GROUP_DELEGATE_CHANGES_WORK (
+ JOB_ID
+);
+
+
+-- Add "unique" to GROUPS.GROUP_UID
+alter table GROUPS add unique (GROUP_UID);
+
+
+-- update the version
+update CALENDARSERVER set VALUE = '47' where NAME = 'VERSION';
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_46_to_47sql"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_46_to_47.sql (0 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_46_to_47.sql (rev 0)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_46_to_47.sql 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+----
+-- Copyright (c) 2012-2014 Apple Inc. All rights reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+----
+
+---------------------------------------------------
+-- Upgrade database schema from VERSION 46 to 47 --
+---------------------------------------------------
+
+
+
+create table GROUP_DELEGATE_CHANGES_WORK (
+ WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+ JOB_ID integer references JOB not null,
+ DELEGATOR_UID varchar(255) not null,
+ READ_DELEGATE_UID varchar(255) not null,
+ WRITE_DELEGATE_UID varchar(255) not null
+);
+
+create index GROUP_DELEGATE_CHANGES_WORK_JOB_ID on
+ GROUP_DELEGATE_CHANGES_WORK(JOB_ID);
+
+
+-- Add "unique" to GROUPS.GROUP_UID
+alter table GROUPS add unique (GROUP_UID);
+
+
+-- update the version
+update CALENDARSERVER set VALUE = '47' where NAME = 'VERSION';
</ins></span></pre></div>
<a id="CalendarServertrunktxdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/client.py (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/client.py 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/txdav/dps/client.py 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -41,7 +41,8 @@
</span><span class="cx"> RecordsMatchingTokensCommand, RecordsMatchingFieldsCommand,
</span><span class="cx"> MembersCommand, GroupsCommand, SetMembersCommand,
</span><span class="cx"> VerifyPlaintextPasswordCommand, VerifyHTTPDigestCommand,
</span><del>- WikiAccessForUIDCommand, ContinuationCommand, StatsCommand
</del><ins>+ WikiAccessForUIDCommand, ContinuationCommand,
+ StatsCommand, ExternalDelegatesCommand, ExpandedMemberUIDsCommand
</ins><span class="cx"> )
</span><span class="cx"> from txdav.who.delegates import RecordType as DelegatesRecordType
</span><span class="cx"> from txdav.who.directory import (
</span><span class="lines">@@ -136,12 +137,12 @@
</span><span class="cx">
</span><span class="cx"> def _processMultipleRecords(self, result):
</span><span class="cx"> """
</span><del>- Takes a dictionary with a "fieldsList" key whose value is an iterable
</del><ins>+ Takes a dictionary with a "items" key whose value is an iterable
</ins><span class="cx"> of pickled dictionaries (of records' fields), and returns a list of
</span><span class="cx"> records.
</span><span class="cx"> """
</span><span class="cx"> serializedFieldsList = []
</span><del>- for fields in result["fieldsList"]:
</del><ins>+ for fields in result["items"]:
</ins><span class="cx"> fields = pickle.loads(fields)
</span><span class="cx"> serializedFieldsList.append(fields)
</span><span class="cx"> results = []
</span><span class="lines">@@ -193,8 +194,8 @@
</span><span class="cx"> numResults = 0
</span><span class="cx"> if "fields" in results:
</span><span class="cx"> numResults = 1
</span><del>- if "fieldsList" in results:
- numResults = len(results["fieldsList"])
</del><ins>+ if "items" in results:
+ numResults = len(results["items"])
</ins><span class="cx"> log.debug(
</span><span class="cx"> "DPS call {command} duration={duration:.2f}ms, results={numResults}",
</span><span class="cx"> command=command, duration=1000.0 * duration, numResults=numResults
</span><span class="lines">@@ -235,9 +236,9 @@
</span><span class="cx"> )
</span><span class="cx"> multi.append(results)
</span><span class="cx">
</span><del>- results = {"fieldsList": []}
</del><ins>+ results = {"items": []}
</ins><span class="cx"> for result in multi:
</span><del>- results["fieldsList"].extend(result["fieldsList"])
</del><ins>+ results["items"].extend(result["items"])
</ins><span class="cx">
</span><span class="cx"> self._logResultTiming(command, startTime, results)
</span><span class="cx"> returnValue(postProcess(results))
</span><span class="lines">@@ -339,6 +340,14 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def recordsWithDirectoryBasedDelegates(self):
+ return self._call(
+ ExternalDelegatesCommand,
+ self._processMultipleRecords
+ )
+
+
+
</ins><span class="cx"> def recordsFromExpression(self, expression, recordTypes=None):
</span><span class="cx"> raise NotImplementedError(
</span><span class="cx"> "This won't work until expressions are serializable to send "
</span><span class="lines">@@ -426,6 +435,25 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def _convertUIDs(self, results):
+ uids = []
+ for uid in results["items"]:
+ uids.append(uid.decode("utf-8"))
+ return uids
+
+
+ def expandedMemberUIDs(self):
+ log.debug("DPS Client expandedMemberUIDs")
+ if self.recordType is RecordType.group:
+ return self.service._call(
+ ExpandedMemberUIDsCommand,
+ self._convertUIDs,
+ uid=self.uid.encode("utf-8")
+ )
+ else:
+ return succeed([])
+
+
</ins><span class="cx"> def _convertAccess(self, results):
</span><span class="cx"> access = results["access"].decode("utf-8")
</span><span class="cx"> return txdav.who.wiki.WikiAccessLevel.lookupByName(access)
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpscommandspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/commands.py (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/commands.py 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/txdav/dps/commands.py 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> ('recordType', amp.String()),
</span><span class="cx"> ]
</span><span class="cx"> response = [
</span><del>- ('fieldsList', amp.ListOf(amp.String())),
</del><ins>+ ('items', amp.ListOf(amp.String())),
</ins><span class="cx"> ('continuation', amp.String(optional=True)),
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> ('emailAddress', amp.String()),
</span><span class="cx"> ]
</span><span class="cx"> response = [
</span><del>- ('fieldsList', amp.ListOf(amp.String())),
</del><ins>+ ('items', amp.ListOf(amp.String())),
</ins><span class="cx"> ('continuation', amp.String(optional=True)),
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> ('continuation', amp.String(optional=True)),
</span><span class="cx"> ]
</span><span class="cx"> response = [
</span><del>- ('fieldsList', amp.ListOf(amp.String())),
</del><ins>+ ('items', amp.ListOf(amp.String())),
</ins><span class="cx"> ('continuation', amp.String(optional=True)),
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> ('context', amp.String(optional=True)),
</span><span class="cx"> ]
</span><span class="cx"> response = [
</span><del>- ('fieldsList', amp.ListOf(amp.String())),
</del><ins>+ ('items', amp.ListOf(amp.String())),
</ins><span class="cx"> ('continuation', amp.String(optional=True)),
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> ('recordType', amp.String(optional=True)),
</span><span class="cx"> ]
</span><span class="cx"> response = [
</span><del>- ('fieldsList', amp.ListOf(amp.String())),
</del><ins>+ ('items', amp.ListOf(amp.String())),
</ins><span class="cx"> ('continuation', amp.String(optional=True)),
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> class UpdateRecordsCommand(amp.Command):
</span><span class="cx"> arguments = [
</span><del>- ('fieldsList', amp.ListOf(amp.String())),
</del><ins>+ ('items', amp.ListOf(amp.String())),
</ins><span class="cx"> ('create', amp.Boolean(optional=True)),
</span><span class="cx"> ]
</span><span class="cx"> response = [
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> ('uid', amp.String()),
</span><span class="cx"> ]
</span><span class="cx"> response = [
</span><del>- ('fieldsList', amp.ListOf(amp.String())),
</del><ins>+ ('items', amp.ListOf(amp.String())),
</ins><span class="cx"> ('continuation', amp.String(optional=True)),
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> ('uid', amp.String()),
</span><span class="cx"> ]
</span><span class="cx"> response = [
</span><del>- ('fieldsList', amp.ListOf(amp.String())),
</del><ins>+ ('items', amp.ListOf(amp.String())),
</ins><span class="cx"> ('continuation', amp.String(optional=True)),
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -159,7 +159,17 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+class ExpandedMemberUIDsCommand(amp.Command):
+ arguments = [
+ ('uid', amp.String()),
+ ]
+ response = [
+ ('items', amp.ListOf(amp.String())),
+ ('continuation', amp.String(optional=True)),
+ ]
</ins><span class="cx">
</span><ins>+
+
</ins><span class="cx"> class VerifyPlaintextPasswordCommand(amp.Command):
</span><span class="cx"> arguments = [
</span><span class="cx"> ('uid', amp.String()),
</span><span class="lines">@@ -201,7 +211,14 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+class ExternalDelegatesCommand(amp.Command):
+ arguments = []
+ response = [
+ ('items', amp.ListOf(amp.String())),
+ ('continuation', amp.String(optional=True)),
+ ]
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> class StatsCommand(amp.Command):
</span><span class="cx"> arguments = []
</span><span class="cx"> response = [
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsjsonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/json.py (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/json.py 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/txdav/dps/json.py 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> from twext.who.expression import (
</span><span class="cx"> CompoundExpression, Operand,
</span><span class="cx"> MatchExpression, MatchType, MatchFlags,
</span><ins>+ ExistsExpression, BooleanExpression
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -46,7 +47,21 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+def existsExpressionAsJSON(expression):
+ return dict(
+ type=expression.__class__.__name__,
+ field=expression.fieldName.name,
+ )
</ins><span class="cx">
</span><ins>+
+def booleanExpressionAsJSON(expression):
+ return dict(
+ type=expression.__class__.__name__,
+ field=expression.fieldName.name,
+ )
+
+
+
</ins><span class="cx"> def compoundExpressionAsJSON(expression):
</span><span class="cx"> return dict(
</span><span class="cx"> type=expression.__class__.__name__,
</span><span class="lines">@@ -63,6 +78,12 @@
</span><span class="cx"> if isinstance(expression, MatchExpression):
</span><span class="cx"> return matchExpressionAsJSON(expression)
</span><span class="cx">
</span><ins>+ if isinstance(expression, ExistsExpression):
+ return existsExpressionAsJSON(expression)
+
+ if isinstance(expression, BooleanExpression):
+ return booleanExpressionAsJSON(expression)
+
</ins><span class="cx"> raise TypeError(
</span><span class="cx"> "Unknown expression type: {!r}".format(expression)
</span><span class="cx"> )
</span><span class="lines">@@ -116,7 +137,32 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+def existsExpressionFromJSON(service, json):
+ try:
+ jsonField = json["field"]
+ except KeyError as e:
+ raise ValueError(
+ "JSON match expression must have {!r} key.".format(e[0])
+ )
</ins><span class="cx">
</span><ins>+ fieldName = service.fieldName.lookupByName(jsonField)
+
+ return ExistsExpression(fieldName)
+
+
+def booleanExpressionFromJSON(service, json):
+ try:
+ jsonField = json["field"]
+ except KeyError as e:
+ raise ValueError(
+ "JSON match expression must have {!r} key.".format(e[0])
+ )
+
+ fieldName = service.fieldName.lookupByName(jsonField)
+
+ return BooleanExpression(fieldName)
+
+
</ins><span class="cx"> def compoundExpressionFromJSON(json):
</span><span class="cx"> try:
</span><span class="cx"> expressions_json = json["expressions"]
</span><span class="lines">@@ -148,6 +194,12 @@
</span><span class="cx"> if json_type == "MatchExpression":
</span><span class="cx"> return matchExpressionFromJSON(json)
</span><span class="cx">
</span><ins>+ if json_type == "ExistsExpression":
+ return existsExpressionFromJSON(json)
+
+ if json_type == "BooleanExpression":
+ return booleanExpressionFromJSON(json)
+
</ins><span class="cx"> raise NotImplementedError(
</span><span class="cx"> "Unknown expression type: {}".format(json_type)
</span><span class="cx"> )
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpsserverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/server.py (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/server.py 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/txdav/dps/server.py 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> MembersCommand, GroupsCommand, SetMembersCommand,
</span><span class="cx"> VerifyPlaintextPasswordCommand, VerifyHTTPDigestCommand,
</span><span class="cx"> WikiAccessForUIDCommand, ContinuationCommand,
</span><del>- StatsCommand,
</del><ins>+ ExternalDelegatesCommand, StatsCommand, ExpandedMemberUIDsCommand
</ins><span class="cx"> # UpdateRecordsCommand, RemoveRecordsCommand
</span><span class="cx"> )
</span><span class="cx"> from txdav.who.cache import CachingDirectoryService
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> self._directory = directory
</span><span class="cx">
</span><span class="cx"> # How to large we let an AMP response get before breaking it up
</span><del>- self._maxSize = 60000
</del><ins>+ self._maxSize = 55000
</ins><span class="cx">
</span><span class="cx"> # The cache of results we have not fully responded with. A dictionary
</span><span class="cx"> # whose keys are "continuation tokens" and whose values are tuples of
</span><span class="lines">@@ -78,19 +78,20 @@
</span><span class="cx"> self._continuations = {}
</span><span class="cx">
</span><span class="cx">
</span><del>- def _storeContinuation(self, records):
</del><ins>+ def _storeContinuation(self, things, kind):
</ins><span class="cx"> """
</span><span class="cx"> Store an iterable of records and generate an opaque token we can
</span><span class="cx"> give back to the client so they can later retrieve these remaining
</span><span class="cx"> results that did not fit in the previous AMP response.
</span><span class="cx">
</span><del>- @param records: an iterable of records
</del><ins>+ @param things: an iterable
+ @param kind: "items" or "records"
</ins><span class="cx"> @return: a C{str} token
</span><span class="cx"> """
</span><span class="cx"> token = str(uuid.uuid4())
</span><span class="cx"> # FIXME: I included a timestamp just in case we want to have code that
</span><span class="cx"> # looks for stale continuations to expire them.
</span><del>- self._continuations[token] = (datetime.datetime.now(), records)
</del><ins>+ self._continuations[token] = (datetime.datetime.now(), things, kind)
</ins><span class="cx"> return token
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -103,11 +104,12 @@
</span><span class="cx"> @return: an iterable of records, or None if the token does not exist
</span><span class="cx"> """
</span><span class="cx"> if token in self._continuations:
</span><del>- _ignore_timestamp, records = self._continuations[token]
</del><ins>+ _ignore_timestamp, things, kind = self._continuations[token]
</ins><span class="cx"> del self._continuations[token]
</span><span class="cx"> else:
</span><del>- records = None
- return records
</del><ins>+ things = None
+ kind = None
+ return things, kind
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @ContinuationCommand.responder
</span><span class="lines">@@ -120,8 +122,13 @@
</span><span class="cx"> in the previous response.
</span><span class="cx"> """
</span><span class="cx"> log.debug("Continuation: {c}", c=continuation)
</span><del>- records = self._retrieveContinuation(continuation)
- response = self._recordsToResponse(records)
</del><ins>+ things, kind = self._retrieveContinuation(continuation)
+ if kind == "records":
+ response = self._recordsToResponse(things)
+ elif kind == "items":
+ response = self._itemsToResponse(things)
+ else:
+ response = {}
</ins><span class="cx"> # log.debug("Responding with: {response}", response=response)
</span><span class="cx"> return response
</span><span class="cx">
</span><span class="lines">@@ -135,7 +142,7 @@
</span><span class="cx">
</span><span class="cx"> @param records: an iterable of records
</span><span class="cx"> @return: the response dictionary, with a list of pickled records
</span><del>- stored in the "fieldsList" key, and if there are leftover
</del><ins>+ stored in the "items" key, and if there are leftover
</ins><span class="cx"> records that did not fit, there will be a "continuation" key
</span><span class="cx"> containing the token the client must send via ContinuationCommand.
</span><span class="cx"> """
</span><span class="lines">@@ -156,14 +163,53 @@
</span><span class="cx"> fieldsList.append(pickled)
</span><span class="cx"> count += 1
</span><span class="cx">
</span><del>- response = {"fieldsList": fieldsList}
</del><ins>+ response = {"items": fieldsList}
</ins><span class="cx">
</span><span class="cx"> if records:
</span><del>- response["continuation"] = self._storeContinuation(records)
</del><ins>+ response["continuation"] = self._storeContinuation(records, "records")
</ins><span class="cx">
</span><span class="cx"> return response
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def _itemsToResponse(self, items):
+ """
+ Craft an AMP response containing as many items as will fit within
+ the size limit. Remaining items are stored as a "continuation",
+ identified by a token that is returned to the client to fetch later
+ via the ContinuationCommand.
+
+ @param records: an iterable
+ @return: the response dictionary, with a list of items
+ stored in the "items" key, and if there are leftover
+ items that did not fit, there will be a "continuation" key
+ containing the token the client must send via ContinuationCommand.
+ """
+ itemsToSend = []
+ count = 0
+ if items:
+ size = 0
+ while size < self._maxSize:
+ try:
+ item = items.pop()
+ except (KeyError, IndexError):
+ # We're done.
+ # Note: because records is an iterable (list or set)
+ # we're catching both KeyError and IndexError.
+ break
+ size = size + len(item)
+ itemsToSend.append(item)
+ count += 1
+
+ response = {"items": itemsToSend}
+
+ if items:
+ response["continuation"] = self._storeContinuation(items, "items")
+
+ return response
+
+
+
+
</ins><span class="cx"> def recordToDict(self, record):
</span><span class="cx"> """
</span><span class="cx"> Turn a record in a dictionary of fields which can be reconstituted
</span><span class="lines">@@ -173,14 +219,12 @@
</span><span class="cx"> if record is not None:
</span><span class="cx"> for field, value in record.fields.iteritems():
</span><span class="cx"> valueType = record.service.fieldName.valueType(field)
</span><del>- # print("%s: %s (%s)" % (field.name, value, valueType))
</del><span class="cx"> if valueType in (unicode, bool):
</span><span class="cx"> fields[field.name] = value
</span><span class="cx"> elif valueType is uuid.UUID:
</span><span class="cx"> fields[field.name] = str(value)
</span><span class="cx"> elif issubclass(valueType, (Names, NamedConstant)):
</span><span class="cx"> fields[field.name] = value.name if value else None
</span><del>- # print("Server side fields", fields)
</del><span class="cx"> return fields
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -380,6 +424,23 @@
</span><span class="cx"> returnValue(response)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @ExpandedMemberUIDsCommand.responder
+ @inlineCallbacks
+ def expandedMemberUIDs(self, uid):
+ uid = uid.decode("utf-8")
+ log.debug("ExpandedMemberUIDs: {u}", u=uid)
+ try:
+ record = (yield self._directory.recordWithUID(uid))
+ except Exception as e:
+ log.error("Failed in expandedMemberUIDs", error=e)
+ record = None
+
+ uids = yield record.expandedMemberUIDs()
+ response = self._itemsToResponse([u.encode("utf-8") for u in uids])
+ # log.debug("Responding with: {response}", response=response)
+ returnValue(response)
+
+
</ins><span class="cx"> @VerifyPlaintextPasswordCommand.responder
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def verifyPlaintextPassword(self, uid, password):
</span><span class="lines">@@ -468,7 +529,17 @@
</span><span class="cx"> returnValue(response)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @ExternalDelegatesCommand.responder
+ @inlineCallbacks
+ def externalDelegates(self):
+ log.debug("ExternalDelegates")
+ records = yield self._directory.recordsWithDirectoryBasedDelegates()
+ response = self._recordsToResponse(records)
+ # log.debug("Responding with: {response}", response=response)
+ returnValue(response)
</ins><span class="cx">
</span><ins>+
+
</ins><span class="cx"> class DirectoryProxyAMPFactory(Factory):
</span><span class="cx"> """
</span><span class="cx"> """
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpstesttest_clientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/test/test_client.py (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/test/test_client.py 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/txdav/dps/test/test_client.py 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -47,8 +47,8 @@
</span><span class="cx">
</span><span class="cx"> # Mix in the calendar-specific service methods
</span><span class="cx"> class CalendarXMLDirectoryService(
</span><del>- XMLDirectoryService,
- CalendarDirectoryServiceMixin
</del><ins>+ CalendarDirectoryServiceMixin,
+ XMLDirectoryService
</ins><span class="cx"> ):
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="lines">@@ -60,8 +60,8 @@
</span><span class="cx">
</span><span class="cx"> # Mix in the calendar-specific service methods
</span><span class="cx"> class CalendarODDirectoryService(
</span><del>- OpenDirectoryService,
- CalendarDirectoryServiceMixin
</del><ins>+ CalendarDirectoryServiceMixin,
+ OpenDirectoryService
</ins><span class="cx"> ):
</span><span class="cx"> pass
</span><span class="cx">
</span><span class="lines">@@ -590,6 +590,18 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_expandedMemberUIDs(self):
+ group = yield self.client.recordWithUID(u"__top_group_1__")
+ memberUIDs = yield group.expandedMemberUIDs()
+ self.assertEquals(
+ set(memberUIDs),
+ set(
+ [u'__wsanchez1__', u'__cdaboo1__', u'__glyph1__', u'__sagen1__']
+ )
+ )
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_groups(self):
</span><span class="cx">
</span><span class="cx"> # A group must first be "refreshed" into the DB otherwise we won't
</span><span class="lines">@@ -717,8 +729,8 @@
</span><span class="cx">
</span><span class="cx"> # Connect the two services directly via an IOPump
</span><span class="cx"> client = AMP()
</span><del>- server = DirectoryProxyAMPProtocol(remoteDirectory)
- pump = returnConnected(server, client)
</del><ins>+ self.server = DirectoryProxyAMPProtocol(remoteDirectory)
+ pump = returnConnected(self.server, client)
</ins><span class="cx">
</span><span class="cx"> # Replace the normal _getConnection method with one that bypasses any
</span><span class="cx"> # actual networking
</span><span class="lines">@@ -768,3 +780,9 @@
</span><span class="cx"> group = yield self.directory.recordWithUID(u"bigGroup")
</span><span class="cx"> members = yield group.members()
</span><span class="cx"> self.assertEquals(len(members), self.numUsers)
</span><ins>+
+ # force the limit small so continuations happen
+ self.server._maxSize = 500
+ # expandedMemberUIDs
+ memberUIDs = yield group.expandedMemberUIDs()
+ self.assertEquals(len(memberUIDs), self.numUsers)
</ins></span></pre></div>
<a id="CalendarServertrunktxdavwhocachepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/cache.py (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/cache.py 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/txdav/who/cache.py 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -378,6 +378,10 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def recordsWithDirectoryBasedDelegates(self):
+ return self._directory.recordsWithDirectoryBasedDelegates()
+
+
</ins><span class="cx"> def recordWithCalendarUserAddress(self, cua):
</span><span class="cx"> # This will get cached by the underlying recordWith... call
</span><span class="cx"> return CalendarDirectoryServiceMixin.recordWithCalendarUserAddress(
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhodirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/directory.py (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/directory.py 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/txdav/who/directory.py 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -22,7 +22,8 @@
</span><span class="cx">
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.who.expression import (
</span><del>- MatchType, Operand, MatchExpression, CompoundExpression, MatchFlags
</del><ins>+ MatchType, Operand, MatchExpression, CompoundExpression, MatchFlags,
+ ExistsExpression, BooleanExpression
</ins><span class="cx"> )
</span><span class="cx"> from twext.who.idirectory import RecordType as BaseRecordType
</span><span class="cx"> from twisted.cred.credentials import UsernamePassword
</span><span class="lines">@@ -32,7 +33,8 @@
</span><span class="cx"> from txdav.caldav.datastore.scheduling.utils import normalizeCUAddr
</span><span class="cx"> from txdav.who.delegates import RecordType as DelegateRecordType
</span><span class="cx"> from txdav.who.idirectory import (
</span><del>- RecordType as DAVRecordType, AutoScheduleMode
</del><ins>+ RecordType as DAVRecordType, AutoScheduleMode,
+ FieldName as CalFieldName
</ins><span class="cx"> )
</span><span class="cx"> from txweb2.auth.digest import DigestedCredentials
</span><span class="cx">
</span><span class="lines">@@ -257,7 +259,39 @@
</span><span class="cx"> return None
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def recordsWithDirectoryBasedDelegates(self):
+ """
+ Fetch calendar-enabled locations and resources which have proxy
+ groups assigned.
+ """
</ins><span class="cx">
</span><ins>+ expression = CompoundExpression(
+ (
+ BooleanExpression(CalFieldName.hasCalendars),
+ CompoundExpression(
+ (
+ ExistsExpression(CalFieldName.readOnlyProxy),
+ ExistsExpression(CalFieldName.readWriteProxy)
+ ),
+ Operand.OR
+ )
+ ),
+ Operand.AND
+ )
+
+ records = yield self.recordsFromExpression(
+ expression,
+ recordTypes=(self.recordType.location,)
+ # FIXME, commenting out resources for the moment since it's
+ # super slow:
+ # recordTypes=(self.recordType.location, self.recordType.resource)
+
+ )
+ returnValue(records)
+
+
+
</ins><span class="cx"> class CalendarDirectoryRecordMixin(object):
</span><span class="cx"> """
</span><span class="cx"> Calendar (and Contacts) specific logic for directory records lives in this
</span><span class="lines">@@ -535,8 +569,8 @@
</span><span class="cx"> organizerRecord = yield service.recordWithCalendarUserAddress(organizer)
</span><span class="cx"> if organizerRecord is not None:
</span><span class="cx"> autoAcceptGroup = yield service.recordWithUID(autoAcceptGroup)
</span><del>- members = yield autoAcceptGroup.expandedMembers()
- if organizerRecord.uid in ([m.uid for m in members]):
</del><ins>+ memberUIDs = yield autoAcceptGroup.expandedMemberUIDs()
+ if organizerRecord.uid in memberUIDs:
</ins><span class="cx"> returnValue(True)
</span><span class="cx"> returnValue(False)
</span><span class="cx">
</span><span class="lines">@@ -559,14 +593,25 @@
</span><span class="cx"> if self not in seen:
</span><span class="cx"> seen.add(self)
</span><span class="cx"> for member in (yield self.members()):
</span><del>- if member.recordType == BaseRecordType.group:
- yield member.expandedMembers(members, seen)
- else:
- members.add(member)
</del><ins>+ if member is not None:
+ if member.recordType == BaseRecordType.group:
+ yield member.expandedMembers(members, seen)
+ else:
+ members.add(member)
</ins><span class="cx">
</span><span class="cx"> returnValue(members)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def expandedMemberUIDs(self):
+ """
+ Return a L{set} containing the UIDs of the fully expanded membership
+ for this group.
+ """
+ members = yield self.expandedMembers()
+ returnValue([member.uid for member in members])
+
+
</ins><span class="cx"> # For scheduling/freebusy
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def isProxyFor(self, other):
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhogroupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/groups.py (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/groups.py 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/txdav/who/groups.py 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> from txdav.caldav.datastore.sql import CalendarStoreFeatures, ComponentUpdateState
</span><span class="cx"> from txdav.common.datastore.sql_tables import schema, _BIND_MODE_OWN
</span><span class="cx"> import datetime
</span><ins>+import time
</ins><span class="cx">
</span><span class="cx"> log = Logger()
</span><span class="cx">
</span><span class="lines">@@ -47,7 +48,7 @@
</span><span class="cx"> def _enqueue(txn):
</span><span class="cx"> return GroupCacherPollingWork.reschedule(txn, seconds)
</span><span class="cx">
</span><del>- if config.InboxCleanup.Enabled:
</del><ins>+ if config.GroupCaching.Enabled:
</ins><span class="cx"> return store.inTransaction("GroupCacherPollingWork.initialSchedule", _enqueue)
</span><span class="cx"> else:
</span><span class="cx"> return succeed(None)
</span><span class="lines">@@ -67,6 +68,7 @@
</span><span class="cx"> groupCacher = getattr(self.transaction, "_groupCacher", None)
</span><span class="cx"> if groupCacher is not None:
</span><span class="cx">
</span><ins>+ startTime = time.time()
</ins><span class="cx"> try:
</span><span class="cx"> yield groupCacher.update(self.transaction)
</span><span class="cx"> except Exception, e:
</span><span class="lines">@@ -74,6 +76,11 @@
</span><span class="cx"> "Failed to update new group membership cache ({error})",
</span><span class="cx"> error=e
</span><span class="cx"> )
</span><ins>+ endTime = time.time()
+ log.debug(
+ "GroupCacher polling took {duration:0.2f} seconds",
+ duration=(endTime - startTime)
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -112,6 +119,35 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+class GroupDelegateChangesWork(WorkItem, fromTable(schema.GROUP_DELEGATE_CHANGES_WORK)):
+
+ delegator = property(lambda self: (self.table.DELEGATOR_UID == self.delegatorUid))
+
+ @inlineCallbacks
+ def doWork(self):
+ # Delete all other work items for this delegator
+ yield Delete(
+ From=self.table,
+ Where=self.delegator,
+ ).on(self.transaction)
+
+ groupCacher = getattr(self.transaction, "_groupCacher", None)
+ if groupCacher is not None:
+
+ try:
+ yield groupCacher.applyExternalAssignments(
+ self.transaction,
+ self.delegatorUid.decode("utf-8"),
+ self.readDelegateUid.decode("utf-8"),
+ self.writeDelegateUid.decode("utf-8")
+ )
+ except Exception, e:
+ log.error(
+ "Failed to apply external delegates for {uid} {err}",
+ uid=self.delegatorUid, err=e
+ )
+
+
</ins><span class="cx"> class GroupAttendeeReconciliationWork(
</span><span class="cx"> WorkItem, fromTable(schema.GROUP_ATTENDEE_RECONCILE_WORK)
</span><span class="cx"> ):
</span><span class="lines">@@ -288,30 +324,45 @@
</span><span class="cx"> def __init__(
</span><span class="cx"> self, directory,
</span><span class="cx"> updateSeconds=600,
</span><del>- useExternalProxies=False,
- externalProxiesSource=None
</del><ins>+ useDirectoryBasedDelegates=False,
+ directoryBasedDelegatesSource=None
</ins><span class="cx"> ):
</span><span class="cx"> self.directory = directory
</span><del>- self.useExternalProxies = useExternalProxies
- if useExternalProxies and externalProxiesSource is None:
- externalProxiesSource = self.directory.getExternalProxyAssignments
- self.externalProxiesSource = externalProxiesSource
</del><ins>+ self.useDirectoryBasedDelegates = useDirectoryBasedDelegates
+ if useDirectoryBasedDelegates and directoryBasedDelegatesSource is None:
+ directoryBasedDelegatesSource = self.directory.recordsWithDirectoryBasedDelegates
+ self.directoryBasedDelegatesSource = directoryBasedDelegatesSource
</ins><span class="cx"> self.updateSeconds = updateSeconds
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def update(self, txn):
</span><del>- # TODO
- # Pull in external delegate assignments and stick in delegate db
- # if self.useExternalProxies:
- # externalAssignments = (yield self.externalProxiesSource())
- # yield self.applyExternalAssignments(txn, externalAssignments)
</del><span class="cx">
</span><ins>+ if self.useDirectoryBasedDelegates:
+ # Pull in delegate assignments from the directory and stick them
+ # into the delegate db
+ recordsWithDirectoryBasedDelegates = yield self.directoryBasedDelegatesSource()
+ externalAssignments = {}
+ for record in recordsWithDirectoryBasedDelegates:
+ try:
+ readWriteProxy = record.readWriteProxy
+ except AttributeError:
+ readWriteProxy = None
+ try:
+ readOnlyProxy = record.readOnlyProxy
+ except AttributeError:
+ readOnlyProxy = None
+
+ if readOnlyProxy or readWriteProxy:
+ externalAssignments[record.uid] = (readOnlyProxy, readWriteProxy)
+
+ yield self.scheduleExternalAssignments(txn, externalAssignments)
+
</ins><span class="cx"> # Figure out which groups matter
</span><span class="cx"> groupUIDs = yield self.groupsToRefresh(txn)
</span><del>- self.log.debug(
- "Groups to refresh: {g}", g=groupUIDs
- )
</del><ins>+ # self.log.debug(
+ # "Groups to refresh: {g}", g=groupUIDs
+ # )
</ins><span class="cx">
</span><span class="cx"> gr = schema.GROUPS
</span><span class="cx"> if config.AutomaticPurging.Enabled and groupUIDs:
</span><span class="lines">@@ -351,9 +402,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def applyExternalAssignments(self, txn, newAssignments):
</del><ins>+ def scheduleExternalAssignments(
+ self, txn, newAssignments, immediately=False
+ ):
</ins><span class="cx">
</span><del>- oldAssignments = (yield txn.externalDelegates())
</del><ins>+ oldAssignments = yield txn.externalDelegates()
</ins><span class="cx">
</span><span class="cx"> # external assignments is of the form:
</span><span class="cx"> # { delegatorUID: (readDelegateGroupUID, writeDelegateGroupUID),
</span><span class="lines">@@ -364,33 +417,71 @@
</span><span class="cx"> for (
</span><span class="cx"> delegatorUID, (readDelegateUID, writeDelegateUID)
</span><span class="cx"> ) in changed:
</span><del>- readDelegateGroupID = writeDelegateGroupID = None
- if readDelegateUID:
- (
- readDelegateGroupID, _ignore_name, _ignore_hash,
- _ignore_modified, _ignore_extant
- ) = (
- yield txn.groupByUID(readDelegateUID)
</del><ins>+ self.log.debug(
+ "Scheduling external delegate assignment changes for {uid}",
+ uid=delegatorUID
+ )
+ if not readDelegateUID:
+ readDelegateUID = ""
+ if not writeDelegateUID:
+ writeDelegateUID = ""
+ if immediately:
+ yield self.applyExternalAssignments(
+ txn, delegatorUID, readDelegateUID, writeDelegateUID
</ins><span class="cx"> )
</span><del>- if writeDelegateUID:
- (
- writeDelegateGroupID, _ignore_name, _ignore_hash,
- _ignore_modified, _ignore_extant
- ) = (
- yield txn.groupByUID(writeDelegateUID)
</del><ins>+ else:
+ yield GroupDelegateChangesWork.reschedule(
+ txn, 0, delegatorUid=delegatorUID,
+ readDelegateUid=readDelegateUID,
+ writeDelegateUid=writeDelegateUID
</ins><span class="cx"> )
</span><del>- yield txn.assignExternalDelegates(
- delegatorUID, readDelegateGroupID, writeDelegateGroupID,
- readDelegateUID, writeDelegateUID
- )
</del><span class="cx"> if removed:
</span><span class="cx"> for delegatorUID in removed:
</span><del>- yield txn.assignExternalDelegates(
- delegatorUID, None, None, None, None
</del><ins>+ self.log.debug(
+ "Scheduling external delegation assignment removal for {uid}",
+ uid=delegatorUID
</ins><span class="cx"> )
</span><ins>+ if immediately:
+ yield self.applyExternalAssignments(
+ txn, delegatorUID, "", ""
+ )
+ else:
+ yield GroupDelegateChangesWork.reschedule(
+ txn, 0, delegatorUid=delegatorUID,
+ readDelegateUid="", writeDelegateUid=""
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def applyExternalAssignments(
+ self, txn, delegatorUID, readDelegateUID, writeDelegateUID
+ ):
+ self.log.debug(
+ "External delegate assignments changed for {uid}",
+ uid=delegatorUID
+ )
+ readDelegateGroupID = writeDelegateGroupID = None
+ if readDelegateUID:
+ (
+ readDelegateGroupID, _ignore_name, _ignore_hash,
+ _ignore_modified, _ignore_extant
+ ) = (
+ yield txn.groupByUID(readDelegateUID)
+ )
+ if writeDelegateUID:
+ (
+ writeDelegateGroupID, _ignore_name, _ignore_hash,
+ _ignore_modified, _ignore_extant
+ ) = (
+ yield txn.groupByUID(writeDelegateUID)
+ )
+ yield txn.assignExternalDelegates(
+ delegatorUID, readDelegateGroupID, writeDelegateGroupID,
+ readDelegateUID, writeDelegateUID
+ )
+
+
+ @inlineCallbacks
</ins><span class="cx"> def refreshGroup(self, txn, groupUID):
</span><span class="cx"> """
</span><span class="cx"> Does the work of a per-group refresh work item
</span><span class="lines">@@ -398,7 +489,8 @@
</span><span class="cx"> and updates the GROUP_MEMBERSHIP table
</span><span class="cx"> WorkProposal is returned for tests
</span><span class="cx"> """
</span><del>- self.log.debug("Faulting in group: {g}", g=groupUID)
</del><ins>+ self.log.debug("Refreshing group: {g}", g=groupUID)
+
</ins><span class="cx"> record = (yield self.directory.recordWithUID(groupUID))
</span><span class="cx"> if record is None:
</span><span class="cx"> # the group has disappeared from the directory
</span><span class="lines">@@ -421,9 +513,20 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if membershipChanged:
</span><ins>+ self.log.debug(
+ "Membership changed for group {uid} {name}",
+ uid=groupUID,
+ name=cachedName
+ )
</ins><span class="cx"> wpsAttendee = yield self.scheduleGroupAttendeeReconciliations(txn, groupID)
</span><span class="cx"> wpsShareee = yield self.scheduleGroupShareeReconciliations(txn, groupID)
</span><span class="cx"> returnValue(wpsAttendee + wpsShareee)
</span><ins>+ else:
+ self.log.debug(
+ "No membership change for group {uid} {name}",
+ uid=groupUID,
+ name=cachedName
+ )
</ins><span class="cx">
</span><span class="cx"> returnValue(tuple())
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhoidirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/idirectory.py (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/idirectory.py 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/txdav/who/idirectory.py 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -156,6 +156,16 @@
</span><span class="cx"> autoAcceptGroup.description = u"auto-accept group"
</span><span class="cx"> autoAcceptGroup.valueType = BaseFieldName.valueType(BaseFieldName.uid)
</span><span class="cx">
</span><ins>+ readOnlyProxy = NamedConstant()
+ readOnlyProxy.description = u"read-only proxy group"
+ readOnlyProxy.valueType = BaseFieldName.valueType(BaseFieldName.uid)
+
+ readWriteProxy = NamedConstant()
+ readWriteProxy.description = u"read-write proxy group"
+ readWriteProxy.valueType = BaseFieldName.valueType(BaseFieldName.uid)
+
+
+
</ins><span class="cx"> # For "locations", i.e., scheduled spaces:
</span><span class="cx">
</span><span class="cx"> associatedAddress = NamedConstant()
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_groupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_groups.py (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_groups.py 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/txdav/who/test/test_groups.py 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -190,7 +190,9 @@
</span><span class="cx"> newAssignments = {
</span><span class="cx"> u"__wsanchez1__": (None, u"__top_group_1__")
</span><span class="cx"> }
</span><del>- yield self.groupCacher.applyExternalAssignments(txn, newAssignments)
</del><ins>+ yield self.groupCacher.scheduleExternalAssignments(
+ txn, newAssignments, immediately=True
+ )
</ins><span class="cx"> oldExternalAssignments = (yield txn.externalDelegates())
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> oldExternalAssignments,
</span><span class="lines">@@ -215,7 +217,10 @@
</span><span class="cx"> u"__top_group_1__"
</span><span class="cx"> ),
</span><span class="cx"> }
</span><del>- yield self.groupCacher.applyExternalAssignments(txn, newAssignments)
</del><ins>+
+ yield self.groupCacher.scheduleExternalAssignments(
+ txn, newAssignments, immediately=True
+ )
</ins><span class="cx"> oldExternalAssignments = (yield txn.externalDelegates())
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> oldExternalAssignments,
</span><span class="lines">@@ -290,7 +295,9 @@
</span><span class="cx"> None
</span><span class="cx"> ),
</span><span class="cx"> }
</span><del>- yield self.groupCacher.applyExternalAssignments(txn, newAssignments)
</del><ins>+ yield self.groupCacher.scheduleExternalAssignments(
+ txn, newAssignments, immediately=True
+ )
</ins><span class="cx"> oldExternalAssignments = (yield txn.externalDelegates())
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> oldExternalAssignments,
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhoutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/util.py (13867 => 13868)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/util.py 2014-08-12 19:57:18 UTC (rev 13867)
+++ CalendarServer/trunk/txdav/who/util.py 2014-08-12 20:45:40 UTC (rev 13868)
</span><span class="lines">@@ -143,6 +143,9 @@
</span><span class="cx"> BaseFieldName.fullNames: mapping.fullNames,
</span><span class="cx"> BaseFieldName.emailAddresses: mapping.emailAddresses,
</span><span class="cx"> LDAPFieldName.memberDNs: mapping.memberDNs,
</span><ins>+ CalFieldName.readOnlyProxy: mapping.readOnlyProxy,
+ CalFieldName.readWriteProxy: mapping.readWriteProxy,
+ CalFieldName.hasCalendars: mapping.hasCalendars,
</ins><span class="cx"> }),
</span><span class="cx"> recordTypeSchemas=MappingProxyType({
</span><span class="cx"> RecordType.user: RecordTypeSchema(
</span></span></pre>
</div>
</div>
</body>
</html>