<!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>[13191] CalendarServer/trunk/txdav</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/13191">13191</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-04-08 09:20:53 -0700 (Tue, 08 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>change XXX_GUID to XXX_UID in schema for groups/delegation</pre>

<h3>Modified Paths</h3>
<ul>
<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="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv35sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv36sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv35sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv36sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_34_to_35sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_34_to_35.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_34_to_35sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_34_to_35.sql</a></li>
<li><a href="#CalendarServertrunktxdavwhogroupspy">CalendarServer/trunk/txdav/who/groups.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (13190 => 13191)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py        2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py        2014-04-08 16:20:53 UTC (rev 13191)
</span><span class="lines">@@ -932,7 +932,7 @@
</span><span class="cx">         return Insert(
</span><span class="cx">             {
</span><span class="cx">                 gr.NAME: Parameter(&quot;name&quot;),
</span><del>-                gr.GROUP_GUID: Parameter(&quot;groupUID&quot;),
</del><ins>+                gr.GROUP_UID: Parameter(&quot;groupUID&quot;),
</ins><span class="cx">                 gr.MEMBERSHIP_HASH: Parameter(&quot;membershipHash&quot;)
</span><span class="cx">             },
</span><span class="cx">             Return=gr.GROUP_ID
</span><span class="lines">@@ -949,7 +949,7 @@
</span><span class="cx">                 gr.MODIFIED:
</span><span class="cx">                 Parameter(&quot;timestamp&quot;)
</span><span class="cx">             },
</span><del>-            Where=(gr.GROUP_GUID == Parameter(&quot;groupUID&quot;))
</del><ins>+            Where=(gr.GROUP_UID == Parameter(&quot;groupUID&quot;))
</ins><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -959,7 +959,7 @@
</span><span class="cx">         return Select(
</span><span class="cx">             [gr.GROUP_ID, gr.NAME, gr.MEMBERSHIP_HASH, gr.MODIFIED],
</span><span class="cx">             From=gr,
</span><del>-            Where=(gr.GROUP_GUID == Parameter(&quot;groupUID&quot;))
</del><ins>+            Where=(gr.GROUP_UID == Parameter(&quot;groupUID&quot;))
</ins><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -967,7 +967,7 @@
</span><span class="cx">     def _groupByID(cls):
</span><span class="cx">         gr = schema.GROUPS
</span><span class="cx">         return Select(
</span><del>-            [gr.GROUP_GUID, gr.NAME, gr.MEMBERSHIP_HASH],
</del><ins>+            [gr.GROUP_UID, gr.NAME, gr.MEMBERSHIP_HASH],
</ins><span class="cx">             From=gr,
</span><span class="cx">             Where=(gr.GROUP_ID == Parameter(&quot;groupID&quot;))
</span><span class="cx">         )
</span><span class="lines">@@ -1109,7 +1109,7 @@
</span><span class="cx">         return Insert(
</span><span class="cx">             {
</span><span class="cx">                 gm.GROUP_ID: Parameter(&quot;groupID&quot;),
</span><del>-                gm.MEMBER_GUID: Parameter(&quot;memberUID&quot;)
</del><ins>+                gm.MEMBER_UID: Parameter(&quot;memberUID&quot;)
</ins><span class="cx">             }
</span><span class="cx">         )
</span><span class="cx"> 
</span><span class="lines">@@ -1122,7 +1122,7 @@
</span><span class="cx">             Where=(
</span><span class="cx">                 gm.GROUP_ID == Parameter(&quot;groupID&quot;)
</span><span class="cx">             ).And(
</span><del>-                gm.MEMBER_GUID == Parameter(&quot;memberUID&quot;)
</del><ins>+                gm.MEMBER_UID == Parameter(&quot;memberUID&quot;)
</ins><span class="cx">             )
</span><span class="cx">         )
</span><span class="cx"> 
</span><span class="lines">@@ -1131,7 +1131,7 @@
</span><span class="cx">     def _selectGroupMembersQuery(cls):
</span><span class="cx">         gm = schema.GROUP_MEMBERSHIP
</span><span class="cx">         return Select(
</span><del>-            [gm.MEMBER_GUID],
</del><ins>+            [gm.MEMBER_UID],
</ins><span class="cx">             From=gm,
</span><span class="cx">             Where=(
</span><span class="cx">                 gm.GROUP_ID == Parameter(&quot;groupID&quot;)
</span><span class="lines">@@ -1145,7 +1145,7 @@
</span><span class="cx">         gm = schema.GROUP_MEMBERSHIP
</span><span class="cx"> 
</span><span class="cx">         return Select(
</span><del>-            [gr.GROUP_GUID],
</del><ins>+            [gr.GROUP_UID],
</ins><span class="cx">             From=gr,
</span><span class="cx">             Where=(
</span><span class="cx">                 gr.GROUP_ID.In(
</span><span class="lines">@@ -1153,7 +1153,7 @@
</span><span class="cx">                         [gm.GROUP_ID],
</span><span class="cx">                         From=gm,
</span><span class="cx">                         Where=(
</span><del>-                            gm.MEMBER_GUID == Parameter(&quot;uid&quot;)
</del><ins>+                            gm.MEMBER_UID == Parameter(&quot;uid&quot;)
</ins><span class="cx">                         )
</span><span class="cx">                     )
</span><span class="cx">                 )
</span><span class="lines">@@ -1328,7 +1328,7 @@
</span><span class="cx">         gr = schema.GROUPS
</span><span class="cx"> 
</span><span class="cx">         return Select(
</span><del>-            [gr.GROUP_GUID],
</del><ins>+            [gr.GROUP_UID],
</ins><span class="cx">             From=gr,
</span><span class="cx">             Where=(
</span><span class="cx">                 gr.GROUP_ID.In(
</span><span class="lines">@@ -1373,7 +1373,7 @@
</span><span class="cx">                     Select(
</span><span class="cx">                         [gm.GROUP_ID],
</span><span class="cx">                         From=gm,
</span><del>-                        Where=(gm.MEMBER_GUID == Parameter(&quot;delegate&quot;))
</del><ins>+                        Where=(gm.MEMBER_UID == Parameter(&quot;delegate&quot;))
</ins><span class="cx">                     )
</span><span class="cx">                 ).And(
</span><span class="cx">                     dg.READ_WRITE == Parameter(&quot;readWrite&quot;)
</span><span class="lines">@@ -1388,7 +1388,7 @@
</span><span class="cx">         gm = schema.GROUP_MEMBERSHIP
</span><span class="cx"> 
</span><span class="cx">         return Select(
</span><del>-            [gm.MEMBER_GUID],
</del><ins>+            [gm.MEMBER_UID],
</ins><span class="cx">             From=gm,
</span><span class="cx">             Where=(
</span><span class="cx">                 gm.GROUP_ID.In(
</span><span class="lines">@@ -1407,7 +1407,7 @@
</span><span class="cx">     def _selectExternalDelegateGroupsQuery(cls):
</span><span class="cx">         edg = schema.EXTERNAL_DELEGATE_GROUPS
</span><span class="cx">         return Select(
</span><del>-            [edg.DELEGATOR, edg.GROUP_GUID_READ, edg.GROUP_GUID_WRITE],
</del><ins>+            [edg.DELEGATOR, edg.GROUP_UID_READ, edg.GROUP_UID_WRITE],
</ins><span class="cx">             From=edg
</span><span class="cx">         )
</span><span class="cx"> 
</span><span class="lines">@@ -1429,8 +1429,8 @@
</span><span class="cx">         return Insert(
</span><span class="cx">             {
</span><span class="cx">                 edg.DELEGATOR: Parameter(&quot;delegator&quot;),
</span><del>-                edg.GROUP_GUID_READ: Parameter(&quot;readDelegate&quot;),
-                edg.GROUP_GUID_WRITE: Parameter(&quot;writeDelegate&quot;),
</del><ins>+                edg.GROUP_UID_READ: Parameter(&quot;readDelegate&quot;),
+                edg.GROUP_UID_WRITE: Parameter(&quot;writeDelegate&quot;),
</ins><span class="cx">             }
</span><span class="cx">         )
</span><span class="cx"> 
</span><span class="lines">@@ -1713,7 +1713,7 @@
</span><span class="cx">         dg = schema.DELEGATE_GROUPS
</span><span class="cx"> 
</span><span class="cx">         results = (yield Select(
</span><del>-            [gr.GROUP_GUID],
</del><ins>+            [gr.GROUP_UID],
</ins><span class="cx">             From=gr,
</span><span class="cx">             Where=(gr.GROUP_ID.In(Select([dg.GROUP_ID], From=dg, Where=None)))
</span><span class="cx">         ).on(self))
</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 (13190 => 13191)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql        2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql        2014-04-08 16:20:53 UTC (rev 13191)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx">     &quot;HOSTNAME&quot; nvarchar2(255),
</span><span class="cx">     &quot;PID&quot; integer not null,
</span><span class="cx">     &quot;PORT&quot; integer not null,
</span><del>-    &quot;TIME&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
</del><ins>+    &quot;TIME&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</ins><span class="cx">     primary key(&quot;HOSTNAME&quot;, &quot;PORT&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">     &quot;NOTIFICATION_DATA&quot; nclob,
</span><span class="cx">     &quot;MD5&quot; nchar(32),
</span><span class="cx">     &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>-    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
</del><ins>+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</ins><span class="cx">     unique(&quot;NOTIFICATION_UID&quot;, &quot;NOTIFICATION_HOME_RESOURCE_ID&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -98,8 +98,8 @@
</span><span class="cx">     &quot;ALARM_VEVENT_ALLDAY&quot; nclob default null,
</span><span class="cx">     &quot;ALARM_VTODO_TIMED&quot; nclob default null,
</span><span class="cx">     &quot;ALARM_VTODO_ALLDAY&quot; nclob default null,
</span><del>-    &quot;TIMEZONE&quot; nclob default null, 
-    primary key(&quot;CALENDAR_HOME_RESOURCE_ID&quot;, &quot;CALENDAR_RESOURCE_ID&quot;), 
</del><ins>+    &quot;TIMEZONE&quot; nclob default null,
+    primary key(&quot;CALENDAR_HOME_RESOURCE_ID&quot;, &quot;CALENDAR_RESOURCE_ID&quot;),
</ins><span class="cx">     unique(&quot;CALENDAR_HOME_RESOURCE_ID&quot;, &quot;CALENDAR_RESOURCE_NAME&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx">     &quot;PRIVATE_COMMENTS&quot; integer default 0 not null,
</span><span class="cx">     &quot;MD5&quot; nchar(32),
</span><span class="cx">     &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>-    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
</del><ins>+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</ins><span class="cx">     unique(&quot;CALENDAR_RESOURCE_ID&quot;, &quot;RESOURCE_NAME&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -213,8 +213,8 @@
</span><span class="cx"> create table ATTACHMENT_CALENDAR_OBJECT (
</span><span class="cx">     &quot;ATTACHMENT_ID&quot; integer not null references ATTACHMENT on delete cascade,
</span><span class="cx">     &quot;MANAGED_ID&quot; nvarchar2(255),
</span><del>-    &quot;CALENDAR_OBJECT_RESOURCE_ID&quot; integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key(&quot;ATTACHMENT_ID&quot;, &quot;CALENDAR_OBJECT_RESOURCE_ID&quot;), 
</del><ins>+    &quot;CALENDAR_OBJECT_RESOURCE_ID&quot; integer not null references CALENDAR_OBJECT on delete cascade,
+    primary key(&quot;ATTACHMENT_ID&quot;, &quot;CALENDAR_OBJECT_RESOURCE_ID&quot;),
</ins><span class="cx">     unique(&quot;MANAGED_ID&quot;, &quot;CALENDAR_OBJECT_RESOURCE_ID&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx">     &quot;RESOURCE_ID&quot; integer not null,
</span><span class="cx">     &quot;NAME&quot; nvarchar2(255),
</span><span class="cx">     &quot;VALUE&quot; nclob,
</span><del>-    &quot;VIEWER_UID&quot; nvarchar2(255), 
</del><ins>+    &quot;VIEWER_UID&quot; nvarchar2(255),
</ins><span class="cx">     primary key(&quot;RESOURCE_ID&quot;, &quot;NAME&quot;, &quot;VIEWER_UID&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -249,8 +249,8 @@
</span><span class="cx">     &quot;BIND_MODE&quot; integer not null,
</span><span class="cx">     &quot;BIND_STATUS&quot; integer not null,
</span><span class="cx">     &quot;BIND_REVISION&quot; integer default 0 not null,
</span><del>-    &quot;MESSAGE&quot; nclob, 
-    primary key(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;OWNER_HOME_RESOURCE_ID&quot;), 
</del><ins>+    &quot;MESSAGE&quot; nclob,
+    primary key(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;OWNER_HOME_RESOURCE_ID&quot;),
</ins><span class="cx">     unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;ADDRESSBOOK_RESOURCE_NAME&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -263,8 +263,8 @@
</span><span class="cx">     &quot;KIND&quot; integer not null,
</span><span class="cx">     &quot;MD5&quot; nchar(32),
</span><span class="cx">     &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>-    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;RESOURCE_NAME&quot;), 
</del><ins>+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;RESOURCE_NAME&quot;),
</ins><span class="cx">     unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;VCARD_UID&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -283,14 +283,14 @@
</span><span class="cx">     &quot;MEMBER_ID&quot; integer not null,
</span><span class="cx">     &quot;REVISION&quot; integer not null,
</span><span class="cx">     &quot;REMOVED&quot; integer default 0 not null,
</span><del>-    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
</del><ins>+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</ins><span class="cx">     primary key(&quot;GROUP_ID&quot;, &quot;MEMBER_ID&quot;, &quot;REVISION&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx">     &quot;GROUP_ID&quot; integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx">     &quot;ADDRESSBOOK_ID&quot; integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><del>-    &quot;MEMBER_ADDRESS&quot; nvarchar2(255), 
</del><ins>+    &quot;MEMBER_ADDRESS&quot; nvarchar2(255),
</ins><span class="cx">     primary key(&quot;GROUP_ID&quot;, &quot;MEMBER_ADDRESS&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -302,8 +302,8 @@
</span><span class="cx">     &quot;BIND_MODE&quot; integer not null,
</span><span class="cx">     &quot;BIND_STATUS&quot; integer not null,
</span><span class="cx">     &quot;BIND_REVISION&quot; integer default 0 not null,
</span><del>-    &quot;MESSAGE&quot; nclob, 
-    primary key(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;GROUP_RESOURCE_ID&quot;), 
</del><ins>+    &quot;MESSAGE&quot; nclob,
+    primary key(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;GROUP_RESOURCE_ID&quot;),
</ins><span class="cx">     unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;GROUP_ADDRESSBOOK_NAME&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx">     &quot;RESOURCE_NAME&quot; nvarchar2(255),
</span><span class="cx">     &quot;REVISION&quot; integer not null,
</span><span class="cx">     &quot;DELETED&quot; integer not null,
</span><del>-    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
</del><ins>+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</ins><span class="cx">     unique(&quot;NOTIFICATION_HOME_RESOURCE_ID&quot;, &quot;RESOURCE_NAME&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx">     &quot;MODIFIED&quot; integer not null,
</span><span class="cx">     &quot;SUBSCRIBER_GUID&quot; nvarchar2(255),
</span><span class="cx">     &quot;USER_AGENT&quot; nvarchar2(255) default null,
</span><del>-    &quot;IP_ADDR&quot; nvarchar2(255) default null, 
</del><ins>+    &quot;IP_ADDR&quot; nvarchar2(255) default null,
</ins><span class="cx">     primary key(&quot;TOKEN&quot;, &quot;RESOURCE_KEY&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx">     &quot;ORGANIZER&quot; nvarchar2(255),
</span><span class="cx">     &quot;ATTENDEE&quot; nvarchar2(255),
</span><span class="cx">     &quot;ICALUID&quot; nvarchar2(255),
</span><del>-    &quot;ACCESSED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
</del><ins>+    &quot;ACCESSED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</ins><span class="cx">     primary key(&quot;ORGANIZER&quot;, &quot;ATTENDEE&quot;, &quot;ICALUID&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx"> create table GROUP_REFRESH_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><span class="cx">     &quot;JOB_ID&quot; integer not null references JOB,
</span><del>-    &quot;GROUP_GUID&quot; nvarchar2(255)
</del><ins>+    &quot;GROUP_UID&quot; nvarchar2(255)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE_RECONCILIATION_ (
</span><span class="lines">@@ -405,7 +405,7 @@
</span><span class="cx"> create table GROUPS (
</span><span class="cx">     &quot;GROUP_ID&quot; integer primary key,
</span><span class="cx">     &quot;NAME&quot; nvarchar2(255),
</span><del>-    &quot;GROUP_GUID&quot; nvarchar2(255),
</del><ins>+    &quot;GROUP_UID&quot; nvarchar2(255),
</ins><span class="cx">     &quot;MEMBERSHIP_HASH&quot; nvarchar2(255),
</span><span class="cx">     &quot;EXTANT&quot; integer default 1,
</span><span class="cx">     &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="lines">@@ -414,7 +414,7 @@
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_MEMBERSHIP (
</span><span class="cx">     &quot;GROUP_ID&quot; integer,
</span><del>-    &quot;MEMBER_GUID&quot; nvarchar2(255)
</del><ins>+    &quot;MEMBER_UID&quot; nvarchar2(255)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE (
</span><span class="lines">@@ -438,8 +438,8 @@
</span><span class="cx"> 
</span><span class="cx"> create table EXTERNAL_DELEGATE_GROUPS (
</span><span class="cx">     &quot;DELEGATOR&quot; nvarchar2(255),
</span><del>-    &quot;GROUP_GUID_READ&quot; nvarchar2(255),
-    &quot;GROUP_GUID_WRITE&quot; nvarchar2(255)
</del><ins>+    &quot;GROUP_UID_READ&quot; nvarchar2(255),
+    &quot;GROUP_UID_WRITE&quot; nvarchar2(255)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table CALENDAR_OBJECT_SPLITTER_WORK (
</span><span class="lines">@@ -698,8 +698,8 @@
</span><span class="cx">     JOB_ID
</span><span class="cx"> );
</span><span class="cx"> 
</span><del>-create index GROUPS_GROUP_GUID_ebf7a1d4 on GROUPS (
-    GROUP_GUID
</del><ins>+create index GROUPS_GROUP_UID_ebf7a1d4 on GROUPS (
+    GROUP_UID
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index GROUP_MEMBERSHIP_GROU_9560a5e6 on GROUP_MEMBERSHIP (
</span><span class="lines">@@ -707,7 +707,7 @@
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
</span><del>-    MEMBER_GUID
</del><ins>+    MEMBER_UID
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index CALENDAR_OBJECT_SPLIT_af71dcda on CALENDAR_OBJECT_SPLITTER_WORK (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemacurrentsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql (13190 => 13191)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql        2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql        2014-04-08 16:20:53 UTC (rev 13191)
</span><span class="lines">@@ -456,7 +456,7 @@
</span><span class="cx">   BIND_REVISION                         integer         default 0 not null,
</span><span class="cx">   MESSAGE                               text,                     -- FIXME: xml?
</span><span class="cx"> 
</span><del>-  primary key (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID), -- implicit index 
</del><ins>+  primary key (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID), -- implicit index
</ins><span class="cx">   unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -513,7 +513,7 @@
</span><span class="cx">   GROUP_ID        integer     not null, -- references ADDRESSBOOK_OBJECT on delete cascade,   -- AddressBook Object's (kind=='group') RESOURCE_ID
</span><span class="cx">   ADDRESSBOOK_ID  integer     not null references ADDRESSBOOK_HOME on delete cascade,
</span><span class="cx">   MEMBER_ID       integer     not null, -- references ADDRESSBOOK_OBJECT,                     -- member AddressBook Object's RESOURCE_ID
</span><del>-  REVISION        integer     default nextval('REVISION_SEQ') not null, 
</del><ins>+  REVISION        integer     default nextval('REVISION_SEQ') not null,
</ins><span class="cx">   REMOVED         boolean     default false not null,
</span><span class="cx">   MODIFIED        timestamp   default timezone('UTC', CURRENT_TIMESTAMP),
</span><span class="cx"> 
</span><span class="lines">@@ -755,7 +755,7 @@
</span><span class="cx"> create table GROUP_REFRESH_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      references JOB not null,
</span><del>-  GROUP_GUID                    varchar(255) not null
</del><ins>+  GROUP_UID                     varchar(255) not null
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index GROUP_REFRESH_WORK_JOB_ID on
</span><span class="lines">@@ -775,23 +775,23 @@
</span><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_GUID                    varchar(255) not null,
</del><ins>+  GROUP_UID                     varchar(255) not null,
</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="cx">   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP)
</span><span class="cx"> );
</span><del>-create index GROUPS_GROUP_GUID on
-  GROUPS(GROUP_GUID);
</del><ins>+create index GROUPS_GROUP_UID on
+  GROUPS(GROUP_UID);
</ins><span class="cx"> 
</span><span class="cx"> create table GROUP_MEMBERSHIP (
</span><span class="cx">   GROUP_ID                      integer,
</span><del>-  MEMBER_GUID                   varchar(255) not null
</del><ins>+  MEMBER_UID                   varchar(255) not null
</ins><span class="cx"> );
</span><span class="cx"> create index GROUP_MEMBERSHIP_GROUP on
</span><span class="cx">   GROUP_MEMBERSHIP(GROUP_ID);
</span><span class="cx"> create index GROUP_MEMBERSHIP_MEMBER on
</span><del>-  GROUP_MEMBERSHIP(MEMBER_GUID);
</del><ins>+  GROUP_MEMBERSHIP(MEMBER_UID);
</ins><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE (
</span><span class="cx">   GROUP_ID                      integer,
</span><span class="lines">@@ -818,8 +818,8 @@
</span><span class="cx"> 
</span><span class="cx"> create table EXTERNAL_DELEGATE_GROUPS (
</span><span class="cx">   DELEGATOR                     varchar(255) not null,
</span><del>-  GROUP_GUID_READ               varchar(255),
-  GROUP_GUID_WRITE              varchar(255)
</del><ins>+  GROUP_UID_READ                varchar(255),
+  GROUP_UID_WRITE               varchar(255)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> --------------------------
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv35sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql (13190 => 13191)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql        2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql        2014-04-08 16:20:53 UTC (rev 13191)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx">     &quot;HOSTNAME&quot; nvarchar2(255),
</span><span class="cx">     &quot;PID&quot; integer not null,
</span><span class="cx">     &quot;PORT&quot; integer not null,
</span><del>-    &quot;TIME&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
</del><ins>+    &quot;TIME&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</ins><span class="cx">     primary key(&quot;HOSTNAME&quot;, &quot;PORT&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">     &quot;NOTIFICATION_DATA&quot; nclob,
</span><span class="cx">     &quot;MD5&quot; nchar(32),
</span><span class="cx">     &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>-    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
</del><ins>+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</ins><span class="cx">     unique(&quot;NOTIFICATION_UID&quot;, &quot;NOTIFICATION_HOME_RESOURCE_ID&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -88,8 +88,8 @@
</span><span class="cx">     &quot;ALARM_VEVENT_ALLDAY&quot; nclob default null,
</span><span class="cx">     &quot;ALARM_VTODO_TIMED&quot; nclob default null,
</span><span class="cx">     &quot;ALARM_VTODO_ALLDAY&quot; nclob default null,
</span><del>-    &quot;TIMEZONE&quot; nclob default null, 
-    primary key(&quot;CALENDAR_HOME_RESOURCE_ID&quot;, &quot;CALENDAR_RESOURCE_ID&quot;), 
</del><ins>+    &quot;TIMEZONE&quot; nclob default null,
+    primary key(&quot;CALENDAR_HOME_RESOURCE_ID&quot;, &quot;CALENDAR_RESOURCE_ID&quot;),
</ins><span class="cx">     unique(&quot;CALENDAR_HOME_RESOURCE_ID&quot;, &quot;CALENDAR_RESOURCE_NAME&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx">     &quot;PRIVATE_COMMENTS&quot; integer default 0 not null,
</span><span class="cx">     &quot;MD5&quot; nchar(32),
</span><span class="cx">     &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>-    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
</del><ins>+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</ins><span class="cx">     unique(&quot;CALENDAR_RESOURCE_ID&quot;, &quot;RESOURCE_NAME&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -203,8 +203,8 @@
</span><span class="cx"> create table ATTACHMENT_CALENDAR_OBJECT (
</span><span class="cx">     &quot;ATTACHMENT_ID&quot; integer not null references ATTACHMENT on delete cascade,
</span><span class="cx">     &quot;MANAGED_ID&quot; nvarchar2(255),
</span><del>-    &quot;CALENDAR_OBJECT_RESOURCE_ID&quot; integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key(&quot;ATTACHMENT_ID&quot;, &quot;CALENDAR_OBJECT_RESOURCE_ID&quot;), 
</del><ins>+    &quot;CALENDAR_OBJECT_RESOURCE_ID&quot; integer not null references CALENDAR_OBJECT on delete cascade,
+    primary key(&quot;ATTACHMENT_ID&quot;, &quot;CALENDAR_OBJECT_RESOURCE_ID&quot;),
</ins><span class="cx">     unique(&quot;MANAGED_ID&quot;, &quot;CALENDAR_OBJECT_RESOURCE_ID&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx">     &quot;RESOURCE_ID&quot; integer not null,
</span><span class="cx">     &quot;NAME&quot; nvarchar2(255),
</span><span class="cx">     &quot;VALUE&quot; nclob,
</span><del>-    &quot;VIEWER_UID&quot; nvarchar2(255), 
</del><ins>+    &quot;VIEWER_UID&quot; nvarchar2(255),
</ins><span class="cx">     primary key(&quot;RESOURCE_ID&quot;, &quot;NAME&quot;, &quot;VIEWER_UID&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -239,8 +239,8 @@
</span><span class="cx">     &quot;BIND_MODE&quot; integer not null,
</span><span class="cx">     &quot;BIND_STATUS&quot; integer not null,
</span><span class="cx">     &quot;BIND_REVISION&quot; integer default 0 not null,
</span><del>-    &quot;MESSAGE&quot; nclob, 
-    primary key(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;OWNER_HOME_RESOURCE_ID&quot;), 
</del><ins>+    &quot;MESSAGE&quot; nclob,
+    primary key(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;OWNER_HOME_RESOURCE_ID&quot;),
</ins><span class="cx">     unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;ADDRESSBOOK_RESOURCE_NAME&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -253,8 +253,8 @@
</span><span class="cx">     &quot;KIND&quot; integer not null,
</span><span class="cx">     &quot;MD5&quot; nchar(32),
</span><span class="cx">     &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>-    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;RESOURCE_NAME&quot;), 
</del><ins>+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;RESOURCE_NAME&quot;),
</ins><span class="cx">     unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;VCARD_UID&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -273,14 +273,14 @@
</span><span class="cx">     &quot;MEMBER_ID&quot; integer not null,
</span><span class="cx">     &quot;REVISION&quot; integer not null,
</span><span class="cx">     &quot;REMOVED&quot; integer default 0 not null,
</span><del>-    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
</del><ins>+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</ins><span class="cx">     primary key(&quot;GROUP_ID&quot;, &quot;MEMBER_ID&quot;, &quot;REVISION&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx">     &quot;GROUP_ID&quot; integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx">     &quot;ADDRESSBOOK_ID&quot; integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><del>-    &quot;MEMBER_ADDRESS&quot; nvarchar2(255), 
</del><ins>+    &quot;MEMBER_ADDRESS&quot; nvarchar2(255),
</ins><span class="cx">     primary key(&quot;GROUP_ID&quot;, &quot;MEMBER_ADDRESS&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -292,8 +292,8 @@
</span><span class="cx">     &quot;BIND_MODE&quot; integer not null,
</span><span class="cx">     &quot;BIND_STATUS&quot; integer not null,
</span><span class="cx">     &quot;BIND_REVISION&quot; integer default 0 not null,
</span><del>-    &quot;MESSAGE&quot; nclob, 
-    primary key(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;GROUP_RESOURCE_ID&quot;), 
</del><ins>+    &quot;MESSAGE&quot; nclob,
+    primary key(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;GROUP_RESOURCE_ID&quot;),
</ins><span class="cx">     unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;GROUP_ADDRESSBOOK_NAME&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx">     &quot;RESOURCE_NAME&quot; nvarchar2(255),
</span><span class="cx">     &quot;REVISION&quot; integer not null,
</span><span class="cx">     &quot;DELETED&quot; integer not null,
</span><del>-    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
</del><ins>+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</ins><span class="cx">     unique(&quot;NOTIFICATION_HOME_RESOURCE_ID&quot;, &quot;RESOURCE_NAME&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx">     &quot;MODIFIED&quot; integer not null,
</span><span class="cx">     &quot;SUBSCRIBER_GUID&quot; nvarchar2(255),
</span><span class="cx">     &quot;USER_AGENT&quot; nvarchar2(255) default null,
</span><del>-    &quot;IP_ADDR&quot; nvarchar2(255) default null, 
</del><ins>+    &quot;IP_ADDR&quot; nvarchar2(255) default null,
</ins><span class="cx">     primary key(&quot;TOKEN&quot;, &quot;RESOURCE_KEY&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx">     &quot;ORGANIZER&quot; nvarchar2(255),
</span><span class="cx">     &quot;ATTENDEE&quot; nvarchar2(255),
</span><span class="cx">     &quot;ICALUID&quot; nvarchar2(255),
</span><del>-    &quot;ACCESSED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
</del><ins>+    &quot;ACCESSED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</ins><span class="cx">     primary key(&quot;ORGANIZER&quot;, &quot;ATTENDEE&quot;, &quot;ICALUID&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx"> create table GROUP_REFRESH_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><span class="cx">     &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>-    &quot;GROUP_GUID&quot; nvarchar2(255)
</del><ins>+    &quot;GROUP_UID&quot; nvarchar2(255)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE_RECONCILIATION_ (
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> create table GROUPS (
</span><span class="cx">     &quot;GROUP_ID&quot; integer primary key,
</span><span class="cx">     &quot;NAME&quot; nvarchar2(255),
</span><del>-    &quot;GROUP_GUID&quot; nvarchar2(255),
</del><ins>+    &quot;GROUP_UID&quot; nvarchar2(255),
</ins><span class="cx">     &quot;MEMBERSHIP_HASH&quot; nvarchar2(255),
</span><span class="cx">     &quot;EXTANT&quot; integer default 1,
</span><span class="cx">     &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_MEMBERSHIP (
</span><span class="cx">     &quot;GROUP_ID&quot; integer,
</span><del>-    &quot;MEMBER_GUID&quot; nvarchar2(255)
</del><ins>+    &quot;MEMBER_UID&quot; nvarchar2(255)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE (
</span><span class="lines">@@ -428,8 +428,8 @@
</span><span class="cx"> 
</span><span class="cx"> create table EXTERNAL_DELEGATE_GROUPS (
</span><span class="cx">     &quot;DELEGATOR&quot; nvarchar2(255),
</span><del>-    &quot;GROUP_GUID_READ&quot; nvarchar2(255),
-    &quot;GROUP_GUID_WRITE&quot; nvarchar2(255)
</del><ins>+    &quot;GROUP_UID_READ&quot; nvarchar2(255),
+    &quot;GROUP_UID_WRITE&quot; nvarchar2(255)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table CALENDAR_OBJECT_SPLITTER_WORK (
</span><span class="lines">@@ -649,8 +649,8 @@
</span><span class="cx">     TOKEN
</span><span class="cx"> );
</span><span class="cx"> 
</span><del>-create index GROUPS_GROUP_GUID_ebf7a1d4 on GROUPS (
-    GROUP_GUID
</del><ins>+create index GROUPS_GROUP_UID_ebf7a1d4 on GROUPS (
+    GROUP_UID
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index GROUP_MEMBERSHIP_GROU_9560a5e6 on GROUP_MEMBERSHIP (
</span><span class="lines">@@ -658,7 +658,7 @@
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
</span><del>-    MEMBER_GUID
</del><ins>+    MEMBER_UID
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index CALENDAR_OBJECT_SPLIT_af71dcda on CALENDAR_OBJECT_SPLITTER_WORK (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldoracledialectv36sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql (13190 => 13191)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql        2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql        2014-04-08 16:20:53 UTC (rev 13191)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx">     &quot;HOSTNAME&quot; nvarchar2(255),
</span><span class="cx">     &quot;PID&quot; integer not null,
</span><span class="cx">     &quot;PORT&quot; integer not null,
</span><del>-    &quot;TIME&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
</del><ins>+    &quot;TIME&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
</ins><span class="cx">     primary key(&quot;HOSTNAME&quot;, &quot;PORT&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">     &quot;NOTIFICATION_DATA&quot; nclob,
</span><span class="cx">     &quot;MD5&quot; nchar(32),
</span><span class="cx">     &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>-    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
</del><ins>+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</ins><span class="cx">     unique(&quot;NOTIFICATION_UID&quot;, &quot;NOTIFICATION_HOME_RESOURCE_ID&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -88,8 +88,8 @@
</span><span class="cx">     &quot;ALARM_VEVENT_ALLDAY&quot; nclob default null,
</span><span class="cx">     &quot;ALARM_VTODO_TIMED&quot; nclob default null,
</span><span class="cx">     &quot;ALARM_VTODO_ALLDAY&quot; nclob default null,
</span><del>-    &quot;TIMEZONE&quot; nclob default null, 
-    primary key(&quot;CALENDAR_HOME_RESOURCE_ID&quot;, &quot;CALENDAR_RESOURCE_ID&quot;), 
</del><ins>+    &quot;TIMEZONE&quot; nclob default null,
+    primary key(&quot;CALENDAR_HOME_RESOURCE_ID&quot;, &quot;CALENDAR_RESOURCE_ID&quot;),
</ins><span class="cx">     unique(&quot;CALENDAR_HOME_RESOURCE_ID&quot;, &quot;CALENDAR_RESOURCE_NAME&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx">     &quot;PRIVATE_COMMENTS&quot; integer default 0 not null,
</span><span class="cx">     &quot;MD5&quot; nchar(32),
</span><span class="cx">     &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>-    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
</del><ins>+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</ins><span class="cx">     unique(&quot;CALENDAR_RESOURCE_ID&quot;, &quot;RESOURCE_NAME&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -203,8 +203,8 @@
</span><span class="cx"> create table ATTACHMENT_CALENDAR_OBJECT (
</span><span class="cx">     &quot;ATTACHMENT_ID&quot; integer not null references ATTACHMENT on delete cascade,
</span><span class="cx">     &quot;MANAGED_ID&quot; nvarchar2(255),
</span><del>-    &quot;CALENDAR_OBJECT_RESOURCE_ID&quot; integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key(&quot;ATTACHMENT_ID&quot;, &quot;CALENDAR_OBJECT_RESOURCE_ID&quot;), 
</del><ins>+    &quot;CALENDAR_OBJECT_RESOURCE_ID&quot; integer not null references CALENDAR_OBJECT on delete cascade,
+    primary key(&quot;ATTACHMENT_ID&quot;, &quot;CALENDAR_OBJECT_RESOURCE_ID&quot;),
</ins><span class="cx">     unique(&quot;MANAGED_ID&quot;, &quot;CALENDAR_OBJECT_RESOURCE_ID&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx">     &quot;RESOURCE_ID&quot; integer not null,
</span><span class="cx">     &quot;NAME&quot; nvarchar2(255),
</span><span class="cx">     &quot;VALUE&quot; nclob,
</span><del>-    &quot;VIEWER_UID&quot; nvarchar2(255), 
</del><ins>+    &quot;VIEWER_UID&quot; nvarchar2(255),
</ins><span class="cx">     primary key(&quot;RESOURCE_ID&quot;, &quot;NAME&quot;, &quot;VIEWER_UID&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -239,8 +239,8 @@
</span><span class="cx">     &quot;BIND_MODE&quot; integer not null,
</span><span class="cx">     &quot;BIND_STATUS&quot; integer not null,
</span><span class="cx">     &quot;BIND_REVISION&quot; integer default 0 not null,
</span><del>-    &quot;MESSAGE&quot; nclob, 
-    primary key(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;OWNER_HOME_RESOURCE_ID&quot;), 
</del><ins>+    &quot;MESSAGE&quot; nclob,
+    primary key(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;OWNER_HOME_RESOURCE_ID&quot;),
</ins><span class="cx">     unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;ADDRESSBOOK_RESOURCE_NAME&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -253,8 +253,8 @@
</span><span class="cx">     &quot;KIND&quot; integer not null,
</span><span class="cx">     &quot;MD5&quot; nchar(32),
</span><span class="cx">     &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>-    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;RESOURCE_NAME&quot;), 
</del><ins>+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;RESOURCE_NAME&quot;),
</ins><span class="cx">     unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;VCARD_UID&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -273,14 +273,14 @@
</span><span class="cx">     &quot;MEMBER_ID&quot; integer not null,
</span><span class="cx">     &quot;REVISION&quot; integer not null,
</span><span class="cx">     &quot;REMOVED&quot; integer default 0 not null,
</span><del>-    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
</del><ins>+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</ins><span class="cx">     primary key(&quot;GROUP_ID&quot;, &quot;MEMBER_ID&quot;, &quot;REVISION&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><span class="cx">     &quot;GROUP_ID&quot; integer not null references ADDRESSBOOK_OBJECT on delete cascade,
</span><span class="cx">     &quot;ADDRESSBOOK_ID&quot; integer not null references ADDRESSBOOK_HOME on delete cascade,
</span><del>-    &quot;MEMBER_ADDRESS&quot; nvarchar2(255), 
</del><ins>+    &quot;MEMBER_ADDRESS&quot; nvarchar2(255),
</ins><span class="cx">     primary key(&quot;GROUP_ID&quot;, &quot;MEMBER_ADDRESS&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -292,8 +292,8 @@
</span><span class="cx">     &quot;BIND_MODE&quot; integer not null,
</span><span class="cx">     &quot;BIND_STATUS&quot; integer not null,
</span><span class="cx">     &quot;BIND_REVISION&quot; integer default 0 not null,
</span><del>-    &quot;MESSAGE&quot; nclob, 
-    primary key(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;GROUP_RESOURCE_ID&quot;), 
</del><ins>+    &quot;MESSAGE&quot; nclob,
+    primary key(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;GROUP_RESOURCE_ID&quot;),
</ins><span class="cx">     unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;GROUP_ADDRESSBOOK_NAME&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx">     &quot;RESOURCE_NAME&quot; nvarchar2(255),
</span><span class="cx">     &quot;REVISION&quot; integer not null,
</span><span class="cx">     &quot;DELETED&quot; integer not null,
</span><del>-    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
</del><ins>+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</ins><span class="cx">     unique(&quot;NOTIFICATION_HOME_RESOURCE_ID&quot;, &quot;RESOURCE_NAME&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx">     &quot;MODIFIED&quot; integer not null,
</span><span class="cx">     &quot;SUBSCRIBER_GUID&quot; nvarchar2(255),
</span><span class="cx">     &quot;USER_AGENT&quot; nvarchar2(255) default null,
</span><del>-    &quot;IP_ADDR&quot; nvarchar2(255) default null, 
</del><ins>+    &quot;IP_ADDR&quot; nvarchar2(255) default null,
</ins><span class="cx">     primary key(&quot;TOKEN&quot;, &quot;RESOURCE_KEY&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx">     &quot;ORGANIZER&quot; nvarchar2(255),
</span><span class="cx">     &quot;ATTENDEE&quot; nvarchar2(255),
</span><span class="cx">     &quot;ICALUID&quot; nvarchar2(255),
</span><del>-    &quot;ACCESSED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
</del><ins>+    &quot;ACCESSED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</ins><span class="cx">     primary key(&quot;ORGANIZER&quot;, &quot;ATTENDEE&quot;, &quot;ICALUID&quot;)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx"> create table GROUP_REFRESH_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><span class="cx">     &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>-    &quot;GROUP_GUID&quot; nvarchar2(255)
</del><ins>+    &quot;GROUP_UID&quot; nvarchar2(255)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE_RECONCILIATION_ (
</span><span class="lines">@@ -395,7 +395,7 @@
</span><span class="cx"> create table GROUPS (
</span><span class="cx">     &quot;GROUP_ID&quot; integer primary key,
</span><span class="cx">     &quot;NAME&quot; nvarchar2(255),
</span><del>-    &quot;GROUP_GUID&quot; nvarchar2(255),
</del><ins>+    &quot;GROUP_UID&quot; nvarchar2(255),
</ins><span class="cx">     &quot;MEMBERSHIP_HASH&quot; nvarchar2(255),
</span><span class="cx">     &quot;EXTANT&quot; integer default 1,
</span><span class="cx">     &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_MEMBERSHIP (
</span><span class="cx">     &quot;GROUP_ID&quot; integer,
</span><del>-    &quot;MEMBER_GUID&quot; nvarchar2(255)
</del><ins>+    &quot;MEMBER_UID&quot; nvarchar2(255)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE (
</span><span class="lines">@@ -428,8 +428,8 @@
</span><span class="cx"> 
</span><span class="cx"> create table EXTERNAL_DELEGATE_GROUPS (
</span><span class="cx">     &quot;DELEGATOR&quot; nvarchar2(255),
</span><del>-    &quot;GROUP_GUID_READ&quot; nvarchar2(255),
-    &quot;GROUP_GUID_WRITE&quot; nvarchar2(255)
</del><ins>+    &quot;GROUP_UID_READ&quot; nvarchar2(255),
+    &quot;GROUP_UID_WRITE&quot; nvarchar2(255)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table CALENDAR_OBJECT_SPLITTER_WORK (
</span><span class="lines">@@ -660,8 +660,8 @@
</span><span class="cx">     TOKEN
</span><span class="cx"> );
</span><span class="cx"> 
</span><del>-create index GROUPS_GROUP_GUID_ebf7a1d4 on GROUPS (
-    GROUP_GUID
</del><ins>+create index GROUPS_GROUP_UID_ebf7a1d4 on GROUPS (
+    GROUP_UID
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index GROUP_MEMBERSHIP_GROU_9560a5e6 on GROUP_MEMBERSHIP (
</span><span class="lines">@@ -669,7 +669,7 @@
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
</span><del>-    MEMBER_GUID
</del><ins>+    MEMBER_UID
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index CALENDAR_OBJECT_SPLIT_af71dcda on CALENDAR_OBJECT_SPLITTER_WORK (
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv35sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql (13190 => 13191)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql        2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql        2014-04-08 16:20:53 UTC (rev 13191)
</span><span class="lines">@@ -717,7 +717,7 @@
</span><span class="cx"> create table GROUP_REFRESH_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><span class="cx">   NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
</span><del>-  GROUP_GUID                    varchar(255) not null
</del><ins>+  GROUP_UID                    varchar(255) not null
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE_RECONCILIATION_WORK (
</span><span class="lines">@@ -731,20 +731,20 @@
</span><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_GUID                    varchar(255) not null,
</del><ins>+  GROUP_UID                    varchar(255) not null,
</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="cx">   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP)
</span><span class="cx"> );
</span><del>-create index GROUPS_GROUP_GUID on GROUPS(GROUP_GUID);
</del><ins>+create index GROUPS_GROUP_UID on GROUPS(GROUP_UID);
</ins><span class="cx"> 
</span><span class="cx"> create table GROUP_MEMBERSHIP (
</span><span class="cx">   GROUP_ID                      integer,
</span><del>-  MEMBER_GUID                   varchar(255) not null
</del><ins>+  MEMBER_UID                   varchar(255) not null
</ins><span class="cx"> );
</span><span class="cx"> create index GROUP_MEMBERSHIP_GROUP on GROUP_MEMBERSHIP(GROUP_ID);
</span><del>-create index GROUP_MEMBERSHIP_MEMBER on GROUP_MEMBERSHIP(MEMBER_GUID);
</del><ins>+create index GROUP_MEMBERSHIP_MEMBER on GROUP_MEMBERSHIP(MEMBER_UID);
</ins><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE (
</span><span class="cx">   GROUP_ID                      integer,
</span><span class="lines">@@ -771,8 +771,8 @@
</span><span class="cx"> 
</span><span class="cx"> create table EXTERNAL_DELEGATE_GROUPS (
</span><span class="cx">   DELEGATOR                     varchar(255) not null,
</span><del>-  GROUP_GUID_READ               varchar(255),
-  GROUP_GUID_WRITE              varchar(255)
</del><ins>+  GROUP_UID_READ               varchar(255),
+  GROUP_UID_WRITE              varchar(255)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> --------------------------
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv36sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql (13190 => 13191)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql        2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql        2014-04-08 16:20:53 UTC (rev 13191)
</span><span class="lines">@@ -717,7 +717,7 @@
</span><span class="cx"> create table GROUP_REFRESH_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><span class="cx">   NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
</span><del>-  GROUP_GUID                    varchar(255) not null
</del><ins>+  GROUP_UID                    varchar(255) not null
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE_RECONCILIATION_WORK (
</span><span class="lines">@@ -731,20 +731,20 @@
</span><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_GUID                    varchar(255) not null,
</del><ins>+  GROUP_UID                    varchar(255) not null,
</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="cx">   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP)
</span><span class="cx"> );
</span><del>-create index GROUPS_GROUP_GUID on GROUPS(GROUP_GUID);
</del><ins>+create index GROUPS_GROUP_UID on GROUPS(GROUP_UID);
</ins><span class="cx"> 
</span><span class="cx"> create table GROUP_MEMBERSHIP (
</span><span class="cx">   GROUP_ID                      integer,
</span><del>-  MEMBER_GUID                   varchar(255) not null
</del><ins>+  MEMBER_UID                   varchar(255) not null
</ins><span class="cx"> );
</span><span class="cx"> create index GROUP_MEMBERSHIP_GROUP on GROUP_MEMBERSHIP(GROUP_ID);
</span><del>-create index GROUP_MEMBERSHIP_MEMBER on GROUP_MEMBERSHIP(MEMBER_GUID);
</del><ins>+create index GROUP_MEMBERSHIP_MEMBER on GROUP_MEMBERSHIP(MEMBER_UID);
</ins><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE (
</span><span class="cx">   GROUP_ID                      integer,
</span><span class="lines">@@ -771,8 +771,8 @@
</span><span class="cx"> 
</span><span class="cx"> create table EXTERNAL_DELEGATE_GROUPS (
</span><span class="cx">   DELEGATOR                     varchar(255) not null,
</span><del>-  GROUP_GUID_READ               varchar(255),
-  GROUP_GUID_WRITE              varchar(255)
</del><ins>+  GROUP_UID_READ               varchar(255),
+  GROUP_UID_WRITE              varchar(255)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> --------------------------
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_34_to_35sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_34_to_35.sql (13190 => 13191)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_34_to_35.sql        2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_34_to_35.sql        2014-04-08 16:20:53 UTC (rev 13191)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> create table GROUP_REFRESH_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><span class="cx">     &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><del>-    &quot;GROUP_GUID&quot; nvarchar2(255)
</del><ins>+    &quot;GROUP_UID&quot; nvarchar2(255)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE_RECONCILIATION_ (
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> create table GROUPS (
</span><span class="cx">     &quot;GROUP_ID&quot; integer primary key,
</span><span class="cx">     &quot;NAME&quot; nvarchar2(255),
</span><del>-    &quot;GROUP_GUID&quot; nvarchar2(255),
</del><ins>+    &quot;GROUP_UID&quot; nvarchar2(255),
</ins><span class="cx">     &quot;MEMBERSHIP_HASH&quot; nvarchar2(255),
</span><span class="cx">     &quot;EXTANT&quot; integer default 1,
</span><span class="cx">     &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_MEMBERSHIP (
</span><span class="cx">     &quot;GROUP_ID&quot; integer,
</span><del>-    &quot;MEMBER_GUID&quot; nvarchar2(255)
</del><ins>+    &quot;MEMBER_UID&quot; nvarchar2(255)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE (
</span><span class="lines">@@ -67,13 +67,13 @@
</span><span class="cx"> 
</span><span class="cx"> create table EXTERNAL_DELEGATE_GROUPS (
</span><span class="cx">     &quot;DELEGATOR&quot; nvarchar2(255),
</span><del>-    &quot;GROUP_GUID_READ&quot; nvarchar2(255),
-    &quot;GROUP_GUID_WRITE&quot; nvarchar2(255)
</del><ins>+    &quot;GROUP_UID_READ&quot; nvarchar2(255),
+    &quot;GROUP_UID_WRITE&quot; nvarchar2(255)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-create index GROUPS_GROUP_GUID_ebf7a1d4 on GROUPS (
-    GROUP_GUID
</del><ins>+create index GROUPS_GROUP_UID_ebf7a1d4 on GROUPS (
+    GROUP_UID
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index GROUP_MEMBERSHIP_GROU_9560a5e6 on GROUP_MEMBERSHIP (
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
</span><del>-    MEMBER_GUID
</del><ins>+    MEMBER_UID
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_34_to_35sql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_34_to_35.sql (13190 => 13191)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_34_to_35.sql        2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_34_to_35.sql        2014-04-08 16:20:53 UTC (rev 13191)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> create table GROUP_REFRESH_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><span class="cx">   NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
</span><del>-  GROUP_GUID                    varchar(255) not null
</del><ins>+  GROUP_UID                    varchar(255) not null
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE_RECONCILIATION_WORK (
</span><span class="lines">@@ -38,20 +38,20 @@
</span><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_GUID                    varchar(255) not null,
</del><ins>+  GROUP_UID                    varchar(255) not null,
</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="cx">   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP)
</span><span class="cx"> );
</span><del>-create index GROUPS_GROUP_GUID on GROUPS(GROUP_GUID);
</del><ins>+create index GROUPS_GROUP_UID on GROUPS(GROUP_UID);
</ins><span class="cx"> 
</span><span class="cx"> create table GROUP_MEMBERSHIP (
</span><span class="cx">   GROUP_ID                      integer,
</span><del>-  MEMBER_GUID                   varchar(255) not null
</del><ins>+  MEMBER_UID                   varchar(255) not null
</ins><span class="cx"> );
</span><span class="cx"> create index GROUP_MEMBERSHIP_GROUP on GROUP_MEMBERSHIP(GROUP_ID);
</span><del>-create index GROUP_MEMBERSHIP_MEMBER on GROUP_MEMBERSHIP(MEMBER_GUID);
</del><ins>+create index GROUP_MEMBERSHIP_MEMBER on GROUP_MEMBERSHIP(MEMBER_UID);
</ins><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE (
</span><span class="cx">   GROUP_ID                      integer,
</span><span class="lines">@@ -78,8 +78,8 @@
</span><span class="cx"> 
</span><span class="cx"> create table EXTERNAL_DELEGATE_GROUPS (
</span><span class="cx">   DELEGATOR                     varchar(255) not null,
</span><del>-  GROUP_GUID_READ               varchar(255),
-  GROUP_GUID_WRITE              varchar(255)
</del><ins>+  GROUP_UID_READ               varchar(255),
+  GROUP_UID_WRITE              varchar(255)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> -- Now update the version
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhogroupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/groups.py (13190 => 13191)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/groups.py        2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/who/groups.py        2014-04-08 16:20:53 UTC (rev 13191)
</span><span class="lines">@@ -112,15 +112,13 @@
</span><span class="cx"> 
</span><span class="cx"> class GroupRefreshWork(WorkItem, fromTable(schema.GROUP_REFRESH_WORK)):
</span><span class="cx"> 
</span><del>-    # Note, the schema has &quot;groupGuid&quot;, but really it's a UID.  At some point
-    # we should change the column name.
-    group = property(lambda self: self.groupGuid)
</del><ins>+    group = property(lambda self: self.groupUid)
</ins><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><span class="cx">     def doWork(self):
</span><span class="cx">         # Delete all other work items for this group
</span><span class="cx">         yield Delete(
</span><del>-            From=self.table, Where=(self.table.GROUP_GUID == self.groupGuid)
</del><ins>+            From=self.table, Where=(self.table.GROUP_UID == self.groupUid)
</ins><span class="cx">         ).on(self.transaction)
</span><span class="cx"> 
</span><span class="cx">         groupCacher = getattr(self.transaction, &quot;_groupCacher&quot;, None)
</span><span class="lines">@@ -128,12 +126,12 @@
</span><span class="cx"> 
</span><span class="cx">             try:
</span><span class="cx">                 yield groupCacher.refreshGroup(
</span><del>-                    self.transaction, self.groupGuid.decode(&quot;utf-8&quot;)
</del><ins>+                    self.transaction, self.groupUid.decode(&quot;utf-8&quot;)
</ins><span class="cx">                 )
</span><span class="cx">             except Exception, e:
</span><span class="cx">                 log.error(
</span><span class="cx">                     &quot;Failed to refresh group {group} {err}&quot;,
</span><del>-                    group=self.groupGuid, err=e
</del><ins>+                    group=self.groupUid, err=e
</ins><span class="cx">                 )
</span><span class="cx"> 
</span><span class="cx">         else:
</span><span class="lines">@@ -143,11 +141,11 @@
</span><span class="cx">             )
</span><span class="cx">             log.debug(
</span><span class="cx">                 &quot;Rescheduling group refresh for {group}: {when}&quot;,
</span><del>-                group=self.groupGuid, when=notBefore
</del><ins>+                group=self.groupUid, when=notBefore
</ins><span class="cx">             )
</span><span class="cx">             yield self.transaction.enqueue(
</span><span class="cx">                 GroupRefreshWork,
</span><del>-                groupGuid=self.groupGuid, notBefore=notBefore
</del><ins>+                groupUID=self.groupUid, notBefore=notBefore
</ins><span class="cx">             )
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -248,7 +246,7 @@
</span><span class="cx">             )
</span><span class="cx">             self.log.debug(&quot;Enqueuing group refresh for {u}&quot;, u=groupUID)
</span><span class="cx">             yield txn.enqueue(
</span><del>-                GroupRefreshWork, groupGuid=groupUID, notBefore=notBefore
</del><ins>+                GroupRefreshWork, groupUid=groupUID, notBefore=notBefore
</ins><span class="cx">             )
</span><span class="cx">             self.log.debug(&quot;Enqueued group refresh for {u}&quot;, u=groupUID)
</span><span class="cx"> 
</span><span class="lines">@@ -401,7 +399,7 @@
</span><span class="cx">                 GroupAttendeeReconciliationWork,
</span><span class="cx">                 eventID=eventID,
</span><span class="cx">                 groupID=groupID,
</span><del>-                groupGuid=groupUID,
</del><ins>+                groupUID=groupUID,
</ins><span class="cx">                 notBefore=notBefore
</span><span class="cx">             )
</span><span class="cx"> 
</span><span class="lines">@@ -427,7 +425,7 @@
</span><span class="cx">         if groupIDs:
</span><span class="cx">             gr = schema.GROUPS
</span><span class="cx">             rows = yield Select(
</span><del>-                [gr.GROUP_GUID, ],
</del><ins>+                [gr.GROUP_UID, ],
</ins><span class="cx">                 From=gr,
</span><span class="cx">                 Where=gr.GROUP_ID.In(groupIDs)
</span><span class="cx">             ).on(txn)
</span></span></pre>
</div>
</div>

</body>
</html>