<!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>[12782] 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/12782">12782</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-03-01 08:21:25 -0800 (Sat, 01 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Support the new job queue rather than work items.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarserverpushnotifierpy">CalendarServer/trunk/calendarserver/push/notifier.py</a></li>
<li><a href="#CalendarServertrunkcalendarserverpushtesttest_notifierpy">CalendarServer/trunk/calendarserver/push/test/test_notifier.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertapcaldavpy">CalendarServer/trunk/calendarserver/tap/caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertaptesttest_caldavpy">CalendarServer/trunk/calendarserver/tap/test/test_caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolscmdlinepy">CalendarServer/trunk/calendarserver/tools/cmdline.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimipdeliverypy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/delivery.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimipinboundpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimipoutboundpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/outbound.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingworkpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/work.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoresqlpy">CalendarServer/trunk/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_dumppy">CalendarServer/trunk/txdav/common/datastore/sql_dump.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_tablespy">CalendarServer/trunk/txdav/common/datastore/sql_tables.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoretesttest_sql_tablespy">CalendarServer/trunk/txdav/common/datastore/test/test_sql_tables.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreupgradesqltesttest_upgradepy">CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreworkinbox_cleanuppy">CalendarServer/trunk/txdav/common/datastore/work/inbox_cleanup.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreworkrevision_cleanuppy">CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreworktesttest_inbox_cleanuppy">CalendarServer/trunk/txdav/common/datastore/work/test/test_inbox_cleanup.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreworktesttest_revision_cleanuppy">CalendarServer/trunk/txdav/common/datastore/work/test/test_revision_cleanup.py</a></li>
<li><a href="#CalendarServertrunktxdavwhogroupspy">CalendarServer/trunk/txdav/who/groups.py</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbincalendarserver_monitor_jobs">CalendarServer/trunk/bin/calendarserver_monitor_jobs</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolsjobitemspy">CalendarServer/trunk/calendarserver/tools/jobitems.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemacurrentoracledialectextrassql">CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect-extras.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_schemaoldpostgresdialectv36sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradesoracledialectupgrade_from_36_to_37sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_36_to_37.sql</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_36_to_37sql">CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_36_to_37.sql</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbincalendarserver_monitor_jobs"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/bin/calendarserver_monitor_jobs (0 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/calendarserver_monitor_jobs                                (rev 0)
+++ CalendarServer/trunk/bin/calendarserver_monitor_jobs        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+#!/usr/bin/env python
+
+##
+# Copyright (c) 2006-2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+# 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 &quot;AS IS&quot; 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.
+##
+
+import os
+import sys
+
+# In OS X Server context, add to PATH to find Postgres utilities (initdb, pg_ctl)
+if &quot;Server.app&quot; in sys.argv[0]:
+    os.environ[&quot;PATH&quot;] += &quot;:&quot; + os.path.join(os.path.dirname(os.path.dirname(sys.argv[0])), &quot;bin&quot;)
+
+#PYTHONPATH
+
+if __name__ == &quot;__main__&quot;:
+    if &quot;PYTHONPATH&quot; in globals():
+        sys.path.insert(0, PYTHONPATH)
+    else:
+        try:
+            import _calendarserver_preamble
+        except ImportError:
+            sys.exc_clear()
+
+    from calendarserver.tools.jobitems import main
+    main()
</ins><span class="cx">Property changes on: CalendarServer/trunk/bin/calendarserver_monitor_jobs
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="CalendarServertrunkcalendarserverpushnotifierpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/push/notifier.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/push/notifier.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/calendarserver/push/notifier.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> 
</span><span class="cx"> from twext.enterprise.dal.record import fromTable
</span><span class="cx"> from twext.enterprise.dal.syntax import Delete, Select, Parameter
</span><del>-from twext.enterprise.queue import WorkItem
</del><ins>+from twext.enterprise.jobqueue import WorkItem
</ins><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> 
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="lines">@@ -47,11 +47,11 @@
</span><span class="cx"> 
</span><span class="cx">         # Find all work items with the same push ID and find the highest
</span><span class="cx">         # priority.  Delete matching work items.
</span><del>-        results = (yield Select([self.table.WORK_ID, self.table.PRIORITY],
</del><ins>+        results = (yield Select([self.table.WORK_ID, self.table.PUSH_PRIORITY],
</ins><span class="cx">             From=self.table, Where=self.table.PUSH_ID == self.pushID).on(
</span><span class="cx">             self.transaction))
</span><span class="cx"> 
</span><del>-        maxPriority = self.priority
</del><ins>+        maxPriority = self.pushPriority
</ins><span class="cx"> 
</span><span class="cx">         # If there are other enqueued work items for this push ID, find the
</span><span class="cx">         # highest priority one and use that value
</span><span class="lines">@@ -63,17 +63,16 @@
</span><span class="cx">                 workIDs.append(workID)
</span><span class="cx"> 
</span><span class="cx">             # Delete the work items we selected
</span><del>-            yield Delete(From=self.table,
-                         Where=self.table.WORK_ID.In(
-                            Parameter(&quot;workIDs&quot;, len(workIDs)))
-                        ).on(self.transaction, workIDs=workIDs)
</del><ins>+            yield Delete(
+                From=self.table,
+                Where=self.table.WORK_ID.In(Parameter(&quot;workIDs&quot;, len(workIDs)))
+            ).on(self.transaction, workIDs=workIDs)
</ins><span class="cx"> 
</span><span class="cx">         pushDistributor = self.transaction._pushDistributor
</span><span class="cx">         if pushDistributor is not None:
</span><span class="cx">             # Convert the integer priority value back into a constant
</span><span class="cx">             priority = PushPriority.lookupByValue(maxPriority)
</span><del>-            yield pushDistributor.enqueue(self.transaction, self.pushID,
-                priority=priority)
</del><ins>+            yield pushDistributor.enqueue(self.transaction, self.pushID, priority=priority)
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -182,10 +181,12 @@
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Enqueue a push notification work item on the provided transaction.
</span><span class="cx">         &quot;&quot;&quot;
</span><del>-        notBefore = datetime.datetime.utcnow() + datetime.timedelta(seconds=self.coalesceSeconds)
-        yield txn.enqueue(PushNotificationWork,
-            pushID=self.pushKeyForId(prefix, id), notBefore=notBefore,
-            priority=priority.value)
</del><ins>+        yield txn.enqueue(
+            PushNotificationWork,
+            pushID=self.pushKeyForId(prefix, id),
+            notBefore=datetime.datetime.utcnow() + datetime.timedelta(seconds=self.coalesceSeconds),
+            pushPriority=priority.value
+        )
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def newNotifier(self, storeObject):
</span></span></pre></div>
<a id="CalendarServertrunkcalendarserverpushtesttest_notifierpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/push/test/test_notifier.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/push/test/test_notifier.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/calendarserver/push/test/test_notifier.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">         txn = self._sqlCalendarStore.newTransaction()
</span><span class="cx">         wp = (yield txn.enqueue(PushNotificationWork,
</span><span class="cx">             pushID=&quot;/CalDAV/localhost/foo/&quot;,
</span><del>-            priority=PushPriority.high.value
</del><ins>+            pushPriority=PushPriority.high.value
</ins><span class="cx">         ))
</span><span class="cx">         yield txn.commit()
</span><span class="cx">         yield wp.whenExecuted()
</span><span class="lines">@@ -125,26 +125,26 @@
</span><span class="cx">         pushDistributor.reset()
</span><span class="cx">         txn = self._sqlCalendarStore.newTransaction()
</span><span class="cx">         proposals = []
</span><del>-        wp = txn.enqueue(PushNotificationWork,
</del><ins>+        wp = yield txn.enqueue(PushNotificationWork,
</ins><span class="cx">             pushID=&quot;/CalDAV/localhost/bar/&quot;,
</span><del>-            priority=PushPriority.high.value
</del><ins>+            pushPriority=PushPriority.high.value
</ins><span class="cx">         )
</span><span class="cx">         proposals.append(wp.whenExecuted())
</span><del>-        wp = txn.enqueue(PushNotificationWork,
</del><ins>+        wp = yield txn.enqueue(PushNotificationWork,
</ins><span class="cx">             pushID=&quot;/CalDAV/localhost/bar/&quot;,
</span><del>-            priority=PushPriority.high.value
</del><ins>+            pushPriority=PushPriority.high.value
</ins><span class="cx">         )
</span><span class="cx">         proposals.append(wp.whenExecuted())
</span><del>-        wp = txn.enqueue(PushNotificationWork,
</del><ins>+        wp = yield txn.enqueue(PushNotificationWork,
</ins><span class="cx">             pushID=&quot;/CalDAV/localhost/bar/&quot;,
</span><del>-            priority=PushPriority.high.value
</del><ins>+            pushPriority=PushPriority.high.value
</ins><span class="cx">         )
</span><span class="cx">         proposals.append(wp.whenExecuted())
</span><span class="cx">         # Enqueue a different pushID to ensure those are not grouped with
</span><span class="cx">         # the others:
</span><del>-        wp = txn.enqueue(PushNotificationWork,
</del><ins>+        wp = yield txn.enqueue(PushNotificationWork,
</ins><span class="cx">             pushID=&quot;/CalDAV/localhost/baz/&quot;,
</span><del>-            priority=PushPriority.high.value
</del><ins>+            pushPriority=PushPriority.high.value
</ins><span class="cx">         )
</span><span class="cx">         proposals.append(wp.whenExecuted())
</span><span class="cx"> 
</span><span class="lines">@@ -159,19 +159,19 @@
</span><span class="cx">         pushDistributor.reset()
</span><span class="cx">         txn = self._sqlCalendarStore.newTransaction()
</span><span class="cx">         proposals = []
</span><del>-        wp = txn.enqueue(PushNotificationWork,
</del><ins>+        wp = yield txn.enqueue(PushNotificationWork,
</ins><span class="cx">             pushID=&quot;/CalDAV/localhost/bar/&quot;,
</span><del>-            priority=PushPriority.low.value
</del><ins>+            pushPriority=PushPriority.low.value
</ins><span class="cx">         )
</span><span class="cx">         proposals.append(wp.whenExecuted())
</span><del>-        wp = txn.enqueue(PushNotificationWork,
</del><ins>+        wp = yield txn.enqueue(PushNotificationWork,
</ins><span class="cx">             pushID=&quot;/CalDAV/localhost/bar/&quot;,
</span><del>-            priority=PushPriority.high.value
</del><ins>+            pushPriority=PushPriority.high.value
</ins><span class="cx">         )
</span><span class="cx">         proposals.append(wp.whenExecuted())
</span><del>-        wp = txn.enqueue(PushNotificationWork,
</del><ins>+        wp = yield txn.enqueue(PushNotificationWork,
</ins><span class="cx">             pushID=&quot;/CalDAV/localhost/bar/&quot;,
</span><del>-            priority=PushPriority.medium.value
</del><ins>+            pushPriority=PushPriority.medium.value
</ins><span class="cx">         )
</span><span class="cx">         proposals.append(wp.whenExecuted())
</span><span class="cx">         yield txn.commit()
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertapcaldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/caldav.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/caldav.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/calendarserver/tap/caldav.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -55,9 +55,9 @@
</span><span class="cx"> from twext.enterprise.adbapi2 import ConnectionPool
</span><span class="cx"> from twext.enterprise.ienterprise import ORACLE_DIALECT
</span><span class="cx"> from twext.enterprise.ienterprise import POSTGRES_DIALECT
</span><del>-from twext.enterprise.queue import NonPerformingQueuer
-from twext.enterprise.queue import PeerConnectionPool
-from twext.enterprise.queue import WorkerFactory as QueueWorkerFactory
</del><ins>+from twext.enterprise.jobqueue import NonPerformingQueuer
+from twext.enterprise.jobqueue import PeerConnectionPool
+from twext.enterprise.jobqueue import WorkerFactory as QueueWorkerFactory
</ins><span class="cx"> from twext.internet.fswatch import DirectoryChangeListener, IDirectoryChangeListenee
</span><span class="cx"> from twext.internet.ssl import ChainingOpenSSLContextFactory
</span><span class="cx"> from twext.internet.tcp import MaxAcceptTCPServer, MaxAcceptSSLServer
</span><span class="lines">@@ -527,26 +527,27 @@
</span><span class="cx">         if (
</span><span class="cx">              config.DirectoryProxy.Enabled and
</span><span class="cx">              config.DirectoryProxy.SocketPath != &quot;&quot;
</span><del>-         ):
-             log.info(&quot;Adding directory proxy service&quot;)
</del><ins>+        ):
+            log.info(&quot;Adding directory proxy service&quot;)
</ins><span class="cx"> 
</span><del>-             dpsArgv = [
-                 sys.executable,
-                 sys.argv[0],
-             ]
-             if config.UserName:
-                 dpsArgv.extend((&quot;-u&quot;, config.UserName))
-             if config.GroupName:
-                 dpsArgv.extend((&quot;-g&quot;, config.GroupName))
-             dpsArgv.extend((
-                 &quot;--reactor=%s&quot; % (config.Twisted.reactor,),
-                 &quot;-n&quot;, &quot;caldav_directoryproxy&quot;,
-                 &quot;-f&quot;, self.configPath,
-             ))
-             self.monitor.addProcess(&quot;directoryproxy&quot;, dpsArgv,
-                 env=PARENT_ENVIRONMENT)
</del><ins>+            dpsArgv = [
+                sys.executable,
+                sys.argv[0],
+            ]
+            if config.UserName:
+                dpsArgv.extend((&quot;-u&quot;, config.UserName))
+            if config.GroupName:
+                dpsArgv.extend((&quot;-g&quot;, config.GroupName))
+            dpsArgv.extend((
+                &quot;--reactor=%s&quot; % (config.Twisted.reactor,),
+                &quot;-n&quot;, &quot;caldav_directoryproxy&quot;,
+                &quot;-f&quot;, self.configPath,
+            ))
+            self.monitor.addProcess(&quot;directoryproxy&quot;, dpsArgv,
+                env=PARENT_ENVIRONMENT)
</ins><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> class WorkSchedulingService(Service):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     A Service to kick off the initial scheduling of periodic work items.
</span><span class="lines">@@ -1727,7 +1728,7 @@
</span><span class="cx">                 raise StoreNotAvailable()
</span><span class="cx"> 
</span><span class="cx">             from twisted.internet import reactor
</span><del>-            pool = PeerConnectionPool(reactor, store.newTransaction, config.WorkQueue.ampPort, schema)
</del><ins>+            pool = PeerConnectionPool(reactor, store.newTransaction, config.WorkQueue.ampPort)
</ins><span class="cx">             store.queuer = store.queuer.transferProposalCallbacks(pool)
</span><span class="cx">             controlSocket.addFactory(_QUEUE_ROUTE, pool.workerListenerFactory())
</span><span class="cx">             # TODO: now that we have the shared control socket, we should get
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertaptesttest_caldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">     QuitAfterUpgradeStep, DataStoreMonitor
</span><span class="cx"> )
</span><span class="cx"> from calendarserver.provision.root import RootResource
</span><del>-from twext.enterprise.queue import PeerConnectionPool, LocalQueuer
</del><ins>+from twext.enterprise.jobqueue import PeerConnectionPool, LocalQueuer
</ins><span class="cx"> from StringIO import StringIO
</span><span class="cx"> 
</span><span class="cx"> log = Logger()
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolscmdlinepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/cmdline.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/cmdline.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/calendarserver/tools/cmdline.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> import sys
</span><span class="cx"> from calendarserver.tap.util import getRootResource
</span><span class="cx"> from errno import ENOENT, EACCES
</span><del>-from twext.enterprise.queue import NonPerformingQueuer
</del><ins>+from twext.enterprise.jobqueue import NonPerformingQueuer
</ins><span class="cx"> 
</span><span class="cx"> # TODO: direct unit tests for these functions.
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolsjobitemspy"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/calendarserver/tools/jobitems.py (0 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/jobitems.py                                (rev 0)
+++ CalendarServer/trunk/calendarserver/tools/jobitems.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -0,0 +1,199 @@
</span><ins>+#!/usr/bin/env python
+
+##
+# Copyright (c) 2006-2014 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+# 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 &quot;AS IS&quot; 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.
+##
+from __future__ import print_function
+
+from getopt import getopt, GetoptError
+import os
+import sys
+import curses
+
+from twisted.internet.defer import inlineCallbacks, succeed
+from calendarserver.tools.cmdline import utilityMain, WorkerService
+from twext.enterprise.jobqueue import JobItem
+
+useCurses = True
+
+def usage(e=None):
+
+    name = os.path.basename(sys.argv[0])
+    print(&quot;usage: %s [options]&quot; % (name,))
+    print(&quot;&quot;)
+    print(&quot;  TODO: describe usage&quot;)
+    print(&quot;&quot;)
+    print(&quot;options:&quot;)
+    print(&quot;  -h --help: print this help and exit&quot;)
+    print(&quot;  -e --error: send stderr to stdout&quot;)
+    print(&quot;  -f --config &lt;path&gt;: specify caldavd.plist configuration path&quot;)
+    print(&quot;  -t: text output, not curses&quot;)
+    print(&quot;&quot;)
+
+    if e:
+        sys.exit(64)
+    else:
+        sys.exit(0)
+
+
+BOX_WIDTH = 52
+
+def main():
+
+    try:
+        (optargs, _ignore_args) = getopt(
+            sys.argv[1:], &quot;hef:t&quot;, [
+                &quot;help&quot;,
+                &quot;error&quot;,
+                &quot;config=&quot;,
+            ],
+        )
+    except GetoptError, e:
+        usage(e)
+
+    #
+    # Get configuration
+    #
+    global useCurses
+    configFileName = None
+    debug = False
+
+    for opt, arg in optargs:
+        if opt in (&quot;-h&quot;, &quot;--help&quot;):
+            usage()
+
+        if opt in (&quot;-e&quot;, &quot;--error&quot;):
+            debug = True
+
+        elif opt in (&quot;-f&quot;, &quot;--config&quot;):
+            configFileName = arg
+
+        elif opt in (&quot;-t&quot;):
+            useCurses = False
+
+        else:
+            raise NotImplementedError(opt)
+
+    utilityMain(configFileName, JobItemMonitorService, verbose=debug)
+
+
+
+class JobItemMonitorService(WorkerService, object):
+
+    def __init__(self, store):
+        super(JobItemMonitorService, self).__init__(store)
+        from twisted.internet import reactor
+        self.reactor = reactor
+
+
+    def doWork(self):
+        if useCurses:
+            self.screen = curses.initscr()
+            curses.curs_set(0)
+        else:
+            self.screen = None
+        self.windows = []
+        self.updateScreenGeometry()
+        self.reactor.callLater(0, self.updateDisplay)
+        return succeed(None)
+
+
+    def postStartService(self):
+        &quot;&quot;&quot;
+        Don't quit right away
+        &quot;&quot;&quot;
+        pass
+
+
+    def updateScreenGeometry(self):
+        for win in self.windows:
+            del win
+        window = WorkWindow(JobItem.numberOfWorkTypes() + 5, BOX_WIDTH, 0, 0, self.store, &quot;Jobs&quot;)
+        self.windows.append(window)
+
+
+    @inlineCallbacks
+    def updateDisplay(self):
+        for window in self.windows:
+            try:
+                yield window.update()
+            except Exception as e:
+                print(str(e))
+        if not useCurses:
+            print(&quot;-------------&quot;)
+
+        self.reactor.callLater(0.1, self.updateDisplay)
+
+
+
+class WorkWindow(object):
+    def __init__(self, nlines, ncols, begin_y, begin_x, store, title):
+        self.window = curses.newwin(nlines, ncols, begin_y, begin_x) if useCurses else None
+        self.ncols = ncols
+        self.store = store
+        self.title = title
+        self.iter = 0
+        self.lastResult = {}
+
+
+    @inlineCallbacks
+    def update(self):
+        txn = self.store.newTransaction()
+        records = (yield JobItem.histogram(txn))
+        self.iter += 1
+
+        if useCurses:
+            self.window.erase()
+            self.window.border()
+            self.window.addstr(0, 2, self.title + &quot; {} ({})&quot;.format(len(records), self.iter,))
+
+        x = 1
+        y = 1
+        s = &quot; {:&lt;40}{:&gt;8} &quot;.format(&quot;Work Type&quot;, &quot;Count&quot;)
+        if useCurses:
+            self.window.addstr(y, x, s, curses.A_REVERSE)
+        else:
+            print(s)
+        y += 1
+        for work_type, count in sorted(records.items(), key=lambda x: x[0]):
+            changed = work_type in self.lastResult and self.lastResult[work_type] != count
+            s = &quot;{}{:&lt;40}{:&gt;8} &quot;.format(&quot;&gt;&quot; if count else &quot; &quot;, work_type, count)
+            try:
+                if useCurses:
+                    self.window.addstr(y, x, s, curses.A_REVERSE if changed else (curses.A_BOLD if count else curses.A_NORMAL))
+                else:
+                    print(s)
+            except curses.error:
+                pass
+            y += 1
+
+        s = &quot; {:&lt;40}{:&gt;8} &quot;.format(&quot;Total:&quot;, sum(records.values()))
+        if useCurses:
+            self.window.hline(y, x, &quot;-&quot;, BOX_WIDTH - 2)
+            y += 1
+            self.window.addstr(y, x, s)
+        else:
+            print(s)
+        y += 1
+
+        if useCurses:
+            self.window.refresh()
+
+        self.lastResult = records
+        yield txn.commit()
+
+
+if __name__ == &quot;__main__&quot;:
+    main()
</ins><span class="cx">Property changes on: CalendarServer/trunk/calendarserver/tools/jobitems.py
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimipdeliverypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/delivery.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/delivery.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/delivery.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> Handles the sending of scheduling messages via iMIP (mail gateway).
</span><span class="cx"> &quot;&quot;&quot;
</span><span class="cx"> 
</span><del>-from twext.enterprise.queue import inTransaction
</del><ins>+from twext.enterprise.jobqueue import inTransaction
</ins><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from txweb2 import responsecode
</span><span class="cx"> from txweb2.dav.http import ErrorResponse
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimipinboundpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/inbound.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> 
</span><span class="cx"> from twext.enterprise.dal.record import fromTable
</span><span class="cx"> from twext.enterprise.dal.syntax import Delete
</span><del>-from twext.enterprise.queue import WorkItem
</del><ins>+from twext.enterprise.jobqueue import WorkItem
</ins><span class="cx"> from twext.internet.gaiendpoint import GAIEndpoint
</span><span class="cx"> from twext.python.log import Logger, LegacyLogger
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimipoutboundpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/outbound.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/outbound.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/outbound.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> from pycalendar.datetime import DateTime
</span><span class="cx"> from pycalendar.duration import Duration
</span><span class="cx"> from twext.enterprise.dal.record import fromTable
</span><del>-from twext.enterprise.queue import WorkItem
</del><ins>+from twext.enterprise.jobqueue import WorkItem
</ins><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twisted.mail.smtp import messageid, rfc822date
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingworkpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/work.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/work.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/work.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> from twext.enterprise.dal.record import fromTable
</span><span class="cx"> from twext.enterprise.dal.syntax import Select, Insert, Delete, Parameter
</span><span class="cx"> from twext.enterprise.locking import NamedLock
</span><del>-from twext.enterprise.queue import WorkItem
</del><ins>+from twext.enterprise.jobqueue import WorkItem
</ins><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> 
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue, Deferred
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/sql.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> from twext.enterprise.dal.syntax import Update
</span><span class="cx"> from twext.enterprise.dal.syntax import utcNowSQL
</span><span class="cx"> from twext.enterprise.locking import NamedLock
</span><del>-from twext.enterprise.queue import WorkItem
</del><ins>+from twext.enterprise.jobqueue import WorkItem
</ins><span class="cx"> from twext.enterprise.util import parseSQLTimestamp
</span><span class="cx"> from twext.python.clsprop import classproperty
</span><span class="cx"> from twext.python.filepath import CachingFilePath
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx">     Select, Update, ColumnSyntax, TableSyntax, Upper, Count, ALL_COLUMNS, Sum,
</span><span class="cx">     DatabaseLock, DatabaseUnlock)
</span><span class="cx"> from twext.enterprise.ienterprise import AlreadyFinishedError
</span><del>-from twext.enterprise.queue import LocalQueuer
</del><ins>+from twext.enterprise.jobqueue import LocalQueuer
</ins><span class="cx"> from twext.enterprise.util import parseSQLTimestamp
</span><span class="cx"> from twext.internet.decorate import memoizedKey, Memoizable
</span><span class="cx"> from twext.python.clsprop import classproperty
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx">     @type quota: C{int} or C{NoneType}
</span><span class="cx"> 
</span><span class="cx">     @ivar queuer: An object with an C{enqueueWork} method, from
</span><del>-        L{twext.enterprise.queue}.  Initially, this is a L{LocalQueuer}, so it
</del><ins>+        L{twext.enterprise.jobqueue}.  Initially, this is a L{LocalQueuer}, so it
</ins><span class="cx">         is always usable, but in a properly configured environment it will be
</span><span class="cx">         upgraded to a more capable object that can distribute work throughout a
</span><span class="cx">         cluster.
</span><span class="lines">@@ -544,7 +544,7 @@
</span><span class="cx"> 
</span><span class="cx">     def enqueue(self, workItem, **kw):
</span><span class="cx">         &quot;&quot;&quot;
</span><del>-        Enqueue a L{twext.enterprise.queue.WorkItem} for later execution.
</del><ins>+        Enqueue a L{twext.enterprise.jobqueue.WorkItem} for later execution.
</ins><span class="cx"> 
</span><span class="cx">         For example::
</span><span class="cx"> 
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx"> 
</span><span class="cx">         @return: a work proposal describing various events in the work's
</span><span class="cx">             life-cycle.
</span><del>-        @rtype: L{twext.enterprise.queue.WorkProposal}
</del><ins>+        @rtype: L{twext.enterprise.jobqueue.WorkProposal}
</ins><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         return self._store.queuer.enqueueWork(self, workItem, **kw)
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_dumppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_dump.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_dump.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/common/datastore/sql_dump.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> ##
</span><span class="cx"> 
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><del>-from twext.enterprise.dal.model import Schema, Table, Column, Sequence
</del><ins>+from twext.enterprise.dal.model import Schema, Table, Column, Sequence, Function
</ins><span class="cx"> from twext.enterprise.dal.parseschema import addSQLToSchema
</span><span class="cx"> 
</span><span class="cx"> &quot;&quot;&quot;
</span><span class="lines">@@ -61,4 +61,10 @@
</span><span class="cx">         name = row[0]
</span><span class="cx">         Sequence(schema, name)
</span><span class="cx"> 
</span><ins>+    # Functions
+    rows = yield txn.execSQL(&quot;select routine_name from information_schema.routines where routine_schema = '%s';&quot; % (schemaname,))
+    for row in rows:
+        name = row[0]
+        Function(schema, name)
+
</ins><span class="cx">     returnValue(schema)
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemacurrentoracledialectextrassql"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect-extras.sql (0 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect-extras.sql                                (rev 0)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect-extras.sql        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+create or replace function next_job return integer is
+  cursor c1 is select JOB_ID from JOB for update skip locked;
+  result integer;
+begin
+  open c1;
+  fetch c1 into result;
+  select JOB_ID from JOB where ID = result for update;
+  return result;
+end;
+/
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemacurrentoracledialectsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> create sequence RESOURCE_ID_SEQ;
</span><ins>+create sequence JOB_SEQ;
</ins><span class="cx"> create sequence INSTANCE_ID_SEQ;
</span><span class="cx"> create sequence ATTACHMENT_ID_SEQ;
</span><span class="cx"> create sequence REVISION_SEQ;
</span><span class="lines">@@ -15,6 +16,15 @@
</span><span class="cx">     &quot;LOCK_NAME&quot; nvarchar2(255) primary key
</span><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create table JOB (
+    &quot;JOB_ID&quot; integer primary key not null,
+    &quot;WORK_TYPE&quot; nvarchar2(255),
+    &quot;PRIORITY&quot; integer default 0,
+    &quot;WEIGHT&quot; integer default 0,
+    &quot;NOT_BEFORE&quot; timestamp default null,
+    &quot;NOT_AFTER&quot; timestamp default null
+);
+
</ins><span class="cx"> create table CALENDAR_HOME (
</span><span class="cx">     &quot;RESOURCE_ID&quot; integer primary key,
</span><span class="cx">     &quot;OWNER_UID&quot; nvarchar2(255) unique,
</span><span class="lines">@@ -348,7 +358,7 @@
</span><span class="cx"> 
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB,
</ins><span class="cx">     &quot;FROM_ADDR&quot; nvarchar2(255),
</span><span class="cx">     &quot;TO_ADDR&quot; nvarchar2(255),
</span><span class="cx">     &quot;ICALENDAR_TEXT&quot; nclob
</span><span class="lines">@@ -356,12 +366,12 @@
</span><span class="cx"> 
</span><span class="cx"> create table IMIP_POLLING_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table IMIP_REPLY_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB,
</ins><span class="cx">     &quot;ORGANIZER&quot; nvarchar2(255),
</span><span class="cx">     &quot;ATTENDEE&quot; nvarchar2(255),
</span><span class="cx">     &quot;ICALENDAR_TEXT&quot; nclob
</span><span class="lines">@@ -369,25 +379,25 @@
</span><span class="cx"> 
</span><span class="cx"> create table PUSH_NOTIFICATION_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB,
</ins><span class="cx">     &quot;PUSH_ID&quot; nvarchar2(255),
</span><del>-    &quot;PRIORITY&quot; integer not null
</del><ins>+    &quot;PUSH_PRIORITY&quot; integer not null
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_CACHER_POLLING_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_REFRESH_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB,
</ins><span class="cx">     &quot;GROUP_GUID&quot; nvarchar2(255)
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE_RECONCILIATION_ (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB,
</ins><span class="cx">     &quot;RESOURCE_ID&quot; integer,
</span><span class="cx">     &quot;GROUP_ID&quot; integer
</span><span class="cx"> );
</span><span class="lines">@@ -434,34 +444,34 @@
</span><span class="cx"> 
</span><span class="cx"> create table CALENDAR_OBJECT_SPLITTER_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB,
</ins><span class="cx">     &quot;RESOURCE_ID&quot; integer not null references CALENDAR_OBJECT on delete cascade
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table FIND_MIN_VALID_REVISION_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table REVISION_CLEANUP_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table INBOX_CLEANUP_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table CLEANUP_ONE_INBOX_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB,
</ins><span class="cx">     &quot;HOME_ID&quot; integer not null unique references CALENDAR_HOME on delete cascade
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create table SCHEDULE_REFRESH_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB,
</ins><span class="cx">     &quot;ICALENDAR_UID&quot; nvarchar2(255),
</span><span class="cx">     &quot;HOME_RESOURCE_ID&quot; integer not null references CALENDAR_HOME on delete cascade,
</span><span class="cx">     &quot;RESOURCE_ID&quot; integer not null references CALENDAR_OBJECT on delete cascade,
</span><span class="lines">@@ -475,7 +485,7 @@
</span><span class="cx"> 
</span><span class="cx"> create table SCHEDULE_AUTO_REPLY_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB,
</ins><span class="cx">     &quot;ICALENDAR_UID&quot; nvarchar2(255),
</span><span class="cx">     &quot;HOME_RESOURCE_ID&quot; integer not null references CALENDAR_HOME on delete cascade,
</span><span class="cx">     &quot;RESOURCE_ID&quot; integer not null references CALENDAR_OBJECT on delete cascade,
</span><span class="lines">@@ -484,7 +494,7 @@
</span><span class="cx"> 
</span><span class="cx"> create table SCHEDULE_ORGANIZER_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB,
</ins><span class="cx">     &quot;ICALENDAR_UID&quot; nvarchar2(255),
</span><span class="cx">     &quot;SCHEDULE_ACTION&quot; integer not null,
</span><span class="cx">     &quot;HOME_RESOURCE_ID&quot; integer not null references CALENDAR_HOME on delete cascade,
</span><span class="lines">@@ -506,7 +516,7 @@
</span><span class="cx"> insert into SCHEDULE_ACTION (DESCRIPTION, ID) values ('remove', 3);
</span><span class="cx"> create table SCHEDULE_REPLY_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB,
</ins><span class="cx">     &quot;ICALENDAR_UID&quot; nvarchar2(255),
</span><span class="cx">     &quot;HOME_RESOURCE_ID&quot; integer not null references CALENDAR_HOME on delete cascade,
</span><span class="cx">     &quot;RESOURCE_ID&quot; integer not null references CALENDAR_OBJECT on delete cascade,
</span><span class="lines">@@ -515,7 +525,7 @@
</span><span class="cx"> 
</span><span class="cx"> create table SCHEDULE_REPLY_CANCEL_WORK (
</span><span class="cx">     &quot;WORK_ID&quot; integer primary key not null,
</span><del>-    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
</del><ins>+    &quot;JOB_ID&quot; integer not null references JOB,
</ins><span class="cx">     &quot;ICALENDAR_UID&quot; nvarchar2(255),
</span><span class="cx">     &quot;HOME_RESOURCE_ID&quot; integer not null references CALENDAR_HOME on delete cascade,
</span><span class="cx">     &quot;ICALENDAR_TEXT&quot; nclob
</span><span class="lines">@@ -526,7 +536,7 @@
</span><span class="cx">     &quot;VALUE&quot; nvarchar2(255)
</span><span class="cx"> );
</span><span class="cx"> 
</span><del>-insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '36');
</del><ins>+insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '37');
</ins><span class="cx"> insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '5');
</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">@@ -660,6 +670,34 @@
</span><span class="cx">     TOKEN
</span><span class="cx"> );
</span><span class="cx"> 
</span><ins>+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 GROUP_ATTENDEE_RECONC_cd2d61b9 on GROUP_ATTENDEE_RECONCILIATION_ (
+    JOB_ID
+);
+
</ins><span class="cx"> create index GROUPS_GROUP_GUID_ebf7a1d4 on GROUPS (
</span><span class="cx">     GROUP_GUID
</span><span class="cx"> );
</span><span class="lines">@@ -676,6 +714,26 @@
</span><span class="cx">     RESOURCE_ID
</span><span class="cx"> );
</span><span class="cx"> 
</span><ins>+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
+);
+
</ins><span class="cx"> create index SCHEDULE_REFRESH_WORK_26084c7b on SCHEDULE_REFRESH_WORK (
</span><span class="cx">     HOME_RESOURCE_ID
</span><span class="cx"> );
</span><span class="lines">@@ -684,6 +742,10 @@
</span><span class="cx">     RESOURCE_ID
</span><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create index SCHEDULE_REFRESH_WORK_3ffa2718 on SCHEDULE_REFRESH_WORK (
+    JOB_ID
+);
+
</ins><span class="cx"> create index SCHEDULE_REFRESH_ATTE_83053b91 on SCHEDULE_REFRESH_ATTENDEES (
</span><span class="cx">     RESOURCE_ID,
</span><span class="cx">     ATTENDEE
</span><span class="lines">@@ -697,6 +759,10 @@
</span><span class="cx">     RESOURCE_ID
</span><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create index SCHEDULE_AUTO_REPLY_W_4d7bb5a8 on SCHEDULE_AUTO_REPLY_WORK (
+    JOB_ID
+);
+
</ins><span class="cx"> create index SCHEDULE_ORGANIZER_WO_18ce4edd on SCHEDULE_ORGANIZER_WORK (
</span><span class="cx">     HOME_RESOURCE_ID
</span><span class="cx"> );
</span><span class="lines">@@ -705,6 +771,10 @@
</span><span class="cx">     RESOURCE_ID
</span><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create index SCHEDULE_ORGANIZER_WO_1e9f246d on SCHEDULE_ORGANIZER_WORK (
+    JOB_ID
+);
+
</ins><span class="cx"> create index SCHEDULE_REPLY_WORK_H_745af8cf on SCHEDULE_REPLY_WORK (
</span><span class="cx">     HOME_RESOURCE_ID
</span><span class="cx"> );
</span><span class="lines">@@ -713,7 +783,29 @@
</span><span class="cx">     RESOURCE_ID
</span><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create index SCHEDULE_REPLY_WORK_J_5913b4a4 on SCHEDULE_REPLY_WORK (
+    JOB_ID
+);
+
</ins><span class="cx"> create index SCHEDULE_REPLY_CANCEL_dab513ef on SCHEDULE_REPLY_CANCEL_WORK (
</span><span class="cx">     HOME_RESOURCE_ID
</span><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create index SCHEDULE_REPLY_CANCEL_94a0c766 on SCHEDULE_REPLY_CANCEL_WORK (
+    JOB_ID
+);
+
+-- Skipped Function next_job
+
+-- Extras
+
+create or replace function next_job return integer is
+  cursor c1 is select ID from JOB for update skip locked;
+  result integer;
+begin
+  open c1;
+  fetch c1 into result;
+  select ID from JOB where ID = result for update;
+  return result;
+end;
+/
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemacurrentsql"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -47,6 +47,30 @@
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+--------------------
+-- 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 default null,
+  NOT_AFTER   timestamp default null
+);
+
+create or replace function next_job() returns integer as $$
+declare
+  result integer;
+begin
+  select JOB_ID into result from JOB where pg_try_advisory_xact_lock(JOB_ID) limit 1 for update;
+  return result;
+end
+$$ LANGUAGE plpgsql;
+
</ins><span class="cx"> -------------------
</span><span class="cx"> -- Calendar Home --
</span><span class="cx"> -------------------
</span><span class="lines">@@ -98,11 +122,11 @@
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index CALENDAR_HOME_METADATA_DEFAULT_EVENTS on
</span><del>-        CALENDAR_HOME_METADATA(DEFAULT_EVENTS);
</del><ins>+  CALENDAR_HOME_METADATA(DEFAULT_EVENTS);
</ins><span class="cx"> create index CALENDAR_HOME_METADATA_DEFAULT_TASKS on
</span><del>-        CALENDAR_HOME_METADATA(DEFAULT_TASKS);
</del><ins>+  CALENDAR_HOME_METADATA(DEFAULT_TASKS);
</ins><span class="cx"> create index CALENDAR_HOME_METADATA_DEFAULT_POLLS on
</span><del>-        CALENDAR_HOME_METADATA(DEFAULT_POLLS);
</del><ins>+  CALENDAR_HOME_METADATA(DEFAULT_POLLS);
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> -----------------------
</span><span class="lines">@@ -142,7 +166,7 @@
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
</span><del>-        NOTIFICATION(NOTIFICATION_HOME_RESOURCE_ID);
</del><ins>+  NOTIFICATION(NOTIFICATION_HOME_RESOURCE_ID);
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> -------------------
</span><span class="lines">@@ -154,11 +178,11 @@
</span><span class="cx"> create table CALENDAR_BIND (
</span><span class="cx">   CALENDAR_HOME_RESOURCE_ID integer      not null references CALENDAR_HOME,
</span><span class="cx">   CALENDAR_RESOURCE_ID      integer      not null references CALENDAR on delete cascade,
</span><del>-  EXTERNAL_ID                            integer      default null,
</del><ins>+  EXTERNAL_ID               integer      default null,
</ins><span class="cx">   CALENDAR_RESOURCE_NAME    varchar(255) not null,
</span><span class="cx">   BIND_MODE                 integer      not null, -- enum CALENDAR_BIND_MODE
</span><span class="cx">   BIND_STATUS               integer      not null, -- enum CALENDAR_BIND_STATUS
</span><del>-  BIND_REVISION                                integer      default 0 not null,
</del><ins>+  BIND_REVISION             integer      default 0 not null,
</ins><span class="cx">   MESSAGE                   text,
</span><span class="cx">   TRANSP                    integer      default 0 not null, -- enum CALENDAR_TRANSP
</span><span class="cx">   ALARM_VEVENT_TIMED        text         default null,
</span><span class="lines">@@ -172,7 +196,7 @@
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index CALENDAR_BIND_RESOURCE_ID on
</span><del>-        CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</del><ins>+  CALENDAR_BIND(CALENDAR_RESOURCE_ID);
</ins><span class="cx"> 
</span><span class="cx"> -- Enumeration of calendar bind modes
</span><span class="cx"> 
</span><span class="lines">@@ -375,7 +399,7 @@
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index ATTACHMENT_CALENDAR_OBJECT_CALENDAR_OBJECT_RESOURCE_ID on
</span><del>-        ATTACHMENT_CALENDAR_OBJECT(CALENDAR_OBJECT_RESOURCE_ID);
</del><ins>+  ATTACHMENT_CALENDAR_OBJECT(CALENDAR_OBJECT_RESOURCE_ID);
</ins><span class="cx"> 
</span><span class="cx"> -----------------------
</span><span class="cx"> -- Resource Property --
</span><span class="lines">@@ -396,11 +420,11 @@
</span><span class="cx"> ----------------------
</span><span class="cx"> 
</span><span class="cx"> create table ADDRESSBOOK_HOME (
</span><del>-  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
</del><ins>+  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
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -423,16 +447,16 @@
</span><span class="cx"> -- Joins sharee ADDRESSBOOK_HOME and owner ADDRESSBOOK_HOME
</span><span class="cx"> 
</span><span class="cx"> create table SHARED_ADDRESSBOOK_BIND (
</span><del>-  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?
</del><ins>+  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?
</ins><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">@@ -445,15 +469,15 @@
</span><span class="cx"> ------------------------
</span><span class="cx"> 
</span><span class="cx"> create table ADDRESSBOOK_OBJECT (
</span><del>-  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),
</del><ins>+  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),
</ins><span class="cx"> 
</span><span class="cx">   unique (ADDRESSBOOK_HOME_RESOURCE_ID, RESOURCE_NAME), -- implicit index
</span><span class="cx">   unique (ADDRESSBOOK_HOME_RESOURCE_ID, VCARD_UID)      -- implicit index
</span><span class="lines">@@ -486,35 +510,35 @@
</span><span class="cx"> ---------------------------------
</span><span class="cx"> 
</span><span class="cx"> create table ABO_MEMBERS (
</span><del>-    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),
</del><ins>+  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),
</ins><span class="cx"> 
</span><span class="cx">     primary key (GROUP_ID, MEMBER_ID, REVISION) -- implicit index
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index ABO_MEMBERS_ADDRESSBOOK_ID on
</span><del>-        ABO_MEMBERS(ADDRESSBOOK_ID);
</del><ins>+  ABO_MEMBERS(ADDRESSBOOK_ID);
</ins><span class="cx"> create index ABO_MEMBERS_MEMBER_ID on
</span><del>-        ABO_MEMBERS(MEMBER_ID);
</del><ins>+  ABO_MEMBERS(MEMBER_ID);
</ins><span class="cx"> 
</span><span class="cx"> ------------------------------------------
</span><span class="cx"> -- Address Book Object Foreign Members  --
</span><span class="cx"> ------------------------------------------
</span><span class="cx"> 
</span><span class="cx"> create table ABO_FOREIGN_MEMBERS (
</span><del>-    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
</del><ins>+  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
</ins><span class="cx"> 
</span><del>-    primary key (GROUP_ID, MEMBER_ADDRESS) -- implicit index
</del><ins>+  primary key (GROUP_ID, MEMBER_ADDRESS) -- implicit index
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index ABO_FOREIGN_MEMBERS_ADDRESSBOOK_ID on
</span><del>-        ABO_FOREIGN_MEMBERS(ADDRESSBOOK_ID);
</del><ins>+  ABO_FOREIGN_MEMBERS(ADDRESSBOOK_ID);
</ins><span class="cx"> 
</span><span class="cx"> -----------------------
</span><span class="cx"> -- Shared Group Bind --
</span><span class="lines">@@ -523,14 +547,14 @@
</span><span class="cx"> -- Joins ADDRESSBOOK_HOME and ADDRESSBOOK_OBJECT (kind == group)
</span><span class="cx"> 
</span><span class="cx"> create table SHARED_GROUP_BIND (
</span><del>-  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?
</del><ins>+  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?
</ins><span class="cx"> 
</span><span class="cx">   primary key (ADDRESSBOOK_HOME_RESOURCE_ID, GROUP_RESOURCE_ID), -- implicit index
</span><span class="cx">   unique (ADDRESSBOOK_HOME_RESOURCE_ID, GROUP_ADDRESSBOOK_NAME)  -- implicit index
</span><span class="lines">@@ -576,14 +600,14 @@
</span><span class="cx"> ----------------------------------
</span><span class="cx"> 
</span><span class="cx"> create table ADDRESSBOOK_OBJECT_REVISIONS (
</span><del>-  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)
</del><ins>+  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)
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index ADDRESSBOOK_OBJECT_REVISIONS_HOME_RESOURCE_ID_OWNER_HOME_RESOURCE_ID
</span><span class="lines">@@ -605,7 +629,7 @@
</span><span class="cx">   RESOURCE_NAME                 varchar(255),
</span><span class="cx">   REVISION                      integer      default nextval('REVISION_SEQ') not null,
</span><span class="cx">   DELETED                       boolean      not null,
</span><del>-  MODIFIED                          timestamp         default timezone('UTC', CURRENT_TIMESTAMP),
</del><ins>+  MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
</ins><span class="cx"> 
</span><span class="cx">   unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
</span><span class="cx"> );
</span><span class="lines">@@ -630,7 +654,7 @@
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index APN_SUBSCRIPTIONS_RESOURCE_KEY
</span><del>-   on APN_SUBSCRIPTIONS(RESOURCE_KEY);
</del><ins>+  on APN_SUBSCRIPTIONS(RESOURCE_KEY);
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> -----------------
</span><span class="lines">@@ -648,7 +672,7 @@
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index IMIP_TOKENS_TOKEN
</span><del>-   on IMIP_TOKENS(TOKEN);
</del><ins>+  on IMIP_TOKENS(TOKEN);
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> ----------------
</span><span class="lines">@@ -664,12 +688,14 @@
</span><span class="cx"> 
</span><span class="cx"> create table IMIP_INVITATION_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
</del><ins>+  JOB_ID                        integer      references JOB not null,
</ins><span class="cx">   FROM_ADDR                     varchar(255) not null,
</span><span class="cx">   TO_ADDR                       varchar(255) not null,
</span><span class="cx">   ICALENDAR_TEXT                text         not null
</span><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create index IMIP_INVITATION_WORK_JOB_ID on
+  IMIP_INVITATION_WORK(JOB_ID);
</ins><span class="cx"> 
</span><span class="cx"> -----------------------
</span><span class="cx"> -- IMIP Polling Work --
</span><span class="lines">@@ -677,57 +703,75 @@
</span><span class="cx"> 
</span><span class="cx"> create table IMIP_POLLING_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP)
</del><ins>+  JOB_ID                        integer      references JOB not null
</ins><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create index IMIP_POLLING_WORK_JOB_ID on
+  IMIP_POLLING_WORK(JOB_ID);
</ins><span class="cx"> 
</span><ins>+
</ins><span class="cx"> ---------------------
</span><span class="cx"> -- IMIP Reply Work --
</span><span class="cx"> ---------------------
</span><span class="cx"> 
</span><span class="cx"> create table IMIP_REPLY_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
</del><ins>+  JOB_ID                        integer      references JOB not null,
</ins><span class="cx">   ORGANIZER                     varchar(255) not null,
</span><span class="cx">   ATTENDEE                      varchar(255) not null,
</span><span class="cx">   ICALENDAR_TEXT                text         not null
</span><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create index IMIP_REPLY_WORK_JOB_ID on
+  IMIP_REPLY_WORK(JOB_ID);
</ins><span class="cx"> 
</span><ins>+
</ins><span class="cx"> ------------------------
</span><span class="cx"> -- Push Notifications --
</span><span class="cx"> ------------------------
</span><span class="cx"> 
</span><span class="cx"> create table PUSH_NOTIFICATION_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
</del><ins>+  JOB_ID                        integer      references JOB not null,
</ins><span class="cx">   PUSH_ID                       varchar(255) not null,
</span><del>-  PRIORITY                      integer      not null -- 1:low 5:medium 10:high
</del><ins>+  PUSH_PRIORITY                 integer      not null -- 1:low 5:medium 10:high
</ins><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create index PUSH_NOTIFICATION_WORK_JOB_ID on
+  PUSH_NOTIFICATION_WORK(JOB_ID);
+
</ins><span class="cx"> -----------------
</span><span class="cx"> -- GroupCacher --
</span><span class="cx"> -----------------
</span><span class="cx"> 
</span><span class="cx"> create table GROUP_CACHER_POLLING_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP)
</del><ins>+  JOB_ID                        integer      references JOB not null
</ins><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create index GROUP_CACHER_POLLING_WORK_JOB_ID on
+  GROUP_CACHER_POLLING_WORK(JOB_ID);
+
</ins><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><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
</del><ins>+  JOB_ID                        integer      references JOB not null,
</ins><span class="cx">   GROUP_GUID                    varchar(255) not null
</span><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create index GROUP_REFRESH_WORK_JOB_ID on
+  GROUP_REFRESH_WORK(JOB_ID);
+
</ins><span class="cx"> create table GROUP_ATTENDEE_RECONCILIATION_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
</del><ins>+  JOB_ID                        integer      references JOB not null,
</ins><span class="cx">   RESOURCE_ID                   integer,
</span><span class="cx">   GROUP_ID                      integer
</span><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create index GROUP_ATTENDEE_RECONCILIATION_WORK_JOB_ID on
+  GROUP_ATTENDEE_RECONCILIATION_WORK(JOB_ID);
</ins><span class="cx"> 
</span><ins>+
</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><span class="lines">@@ -737,14 +781,17 @@
</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_GUID on
+  GROUPS(GROUP_GUID);
</ins><span class="cx"> 
</span><span class="cx"> create table GROUP_MEMBERSHIP (
</span><span class="cx">   GROUP_ID                      integer,
</span><span class="cx">   MEMBER_GUID                   varchar(255) not null
</span><span class="cx"> );
</span><del>-create index GROUP_MEMBERSHIP_GROUP on GROUP_MEMBERSHIP(GROUP_ID);
-create index GROUP_MEMBERSHIP_MEMBER on GROUP_MEMBERSHIP(MEMBER_GUID);
</del><ins>+create index GROUP_MEMBERSHIP_GROUP on
+  GROUP_MEMBERSHIP(GROUP_ID);
+create index GROUP_MEMBERSHIP_MEMBER on
+  GROUP_MEMBERSHIP(MEMBER_GUID);
</ins><span class="cx"> 
</span><span class="cx"> create table GROUP_ATTENDEE (
</span><span class="cx">   GROUP_ID                      integer,
</span><span class="lines">@@ -781,12 +828,14 @@
</span><span class="cx"> 
</span><span class="cx"> create table CALENDAR_OBJECT_SPLITTER_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
</del><ins>+  JOB_ID                        integer      references JOB not null,
</ins><span class="cx">   RESOURCE_ID                   integer      not null references CALENDAR_OBJECT on delete cascade
</span><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index CALENDAR_OBJECT_SPLITTER_WORK_RESOURCE_ID on
</span><del>-        CALENDAR_OBJECT_SPLITTER_WORK(RESOURCE_ID);
</del><ins>+  CALENDAR_OBJECT_SPLITTER_WORK(RESOURCE_ID);
+create index CALENDAR_OBJECT_SPLITTER_WORK_JOB_ID on
+  CALENDAR_OBJECT_SPLITTER_WORK(JOB_ID);
</ins><span class="cx"> 
</span><span class="cx"> ---------------------------
</span><span class="cx"> -- Revision Cleanup Work --
</span><span class="lines">@@ -794,54 +843,68 @@
</span><span class="cx"> 
</span><span class="cx"> create table FIND_MIN_VALID_REVISION_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP)
</del><ins>+  JOB_ID                        integer      references JOB not null
</ins><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create index FIND_MIN_VALID_REVISION_WORK_JOB_ID on
+  FIND_MIN_VALID_REVISION_WORK(JOB_ID);
+
</ins><span class="cx"> create table REVISION_CLEANUP_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP)
</del><ins>+  JOB_ID                        integer      references JOB not null
</ins><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create index REVISION_CLEANUP_WORK_JOB_ID on
+  REVISION_CLEANUP_WORK(JOB_ID);
+
</ins><span class="cx"> ------------------------
</span><span class="cx"> -- Inbox Cleanup Work --
</span><span class="cx"> ------------------------
</span><span class="cx"> 
</span><span class="cx"> create table INBOX_CLEANUP_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP)
</del><ins>+  JOB_ID                        integer      references JOB not null
</ins><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create index INBOX_CLEANUP_WORK_JOB_ID on
+   INBOX_CLEANUP_WORK(JOB_ID);
+
</ins><span class="cx"> create table CLEANUP_ONE_INBOX_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
-  HOME_ID                                      integer      not null unique references CALENDAR_HOME on delete cascade
</del><ins>+  JOB_ID                        integer      references JOB not null,
+  HOME_ID                       integer      not null unique references CALENDAR_HOME on delete cascade
</ins><span class="cx"> );
</span><span class="cx"> 
</span><ins>+create index CLEANUP_ONE_INBOX_WORK_JOB_ID on
+  CLEANUP_ONE_INBOX_WORK(JOB_ID);
+
</ins><span class="cx"> ---------------------------
</span><span class="cx"> -- Schedule Refresh Work --
</span><span class="cx"> ---------------------------
</span><span class="cx"> 
</span><span class="cx"> create table SCHEDULE_REFRESH_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
-  ICALENDAR_UID                                varchar(255) not null,
</del><ins>+  JOB_ID                        integer      references JOB not null,
+  ICALENDAR_UID                 varchar(255) not null,
</ins><span class="cx">   HOME_RESOURCE_ID              integer      not null references CALENDAR_HOME on delete cascade,
</span><span class="cx">   RESOURCE_ID                   integer      not null references CALENDAR_OBJECT on delete cascade,
</span><del>-  ATTENDEE_COUNT                                integer
</del><ins>+  ATTENDEE_COUNT                integer
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index SCHEDULE_REFRESH_WORK_HOME_RESOURCE_ID on
</span><del>-        SCHEDULE_REFRESH_WORK(HOME_RESOURCE_ID);
</del><ins>+  SCHEDULE_REFRESH_WORK(HOME_RESOURCE_ID);
</ins><span class="cx"> create index SCHEDULE_REFRESH_WORK_RESOURCE_ID on
</span><del>-        SCHEDULE_REFRESH_WORK(RESOURCE_ID);
</del><ins>+  SCHEDULE_REFRESH_WORK(RESOURCE_ID);
+create index SCHEDULE_REFRESH_WORK_JOB_ID on
+  SCHEDULE_REFRESH_WORK(JOB_ID);
</ins><span class="cx"> 
</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><del>-  ATTENDEE                                    varchar(255) not null
</del><ins>+  ATTENDEE                      varchar(255) not null
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE on
</span><del>-        SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
</del><ins>+  SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
</ins><span class="cx"> 
</span><span class="cx"> ------------------------------
</span><span class="cx"> -- Schedule Auto Reply Work --
</span><span class="lines">@@ -849,17 +912,19 @@
</span><span class="cx"> 
</span><span class="cx"> create table SCHEDULE_AUTO_REPLY_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
-  ICALENDAR_UID                                varchar(255) not null,
</del><ins>+  JOB_ID                        integer      references JOB not null,
+  ICALENDAR_UID                 varchar(255) not null,
</ins><span class="cx">   HOME_RESOURCE_ID              integer      not null references CALENDAR_HOME on delete cascade,
</span><span class="cx">   RESOURCE_ID                   integer      not null references CALENDAR_OBJECT on delete cascade,
</span><del>-  PARTSTAT                                                varchar(255) not null
</del><ins>+  PARTSTAT                      varchar(255) not null
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index SCHEDULE_AUTO_REPLY_WORK_HOME_RESOURCE_ID on
</span><del>-        SCHEDULE_AUTO_REPLY_WORK(HOME_RESOURCE_ID);
</del><ins>+  SCHEDULE_AUTO_REPLY_WORK(HOME_RESOURCE_ID);
</ins><span class="cx"> create index SCHEDULE_AUTO_REPLY_WORK_RESOURCE_ID on
</span><del>-        SCHEDULE_AUTO_REPLY_WORK(RESOURCE_ID);
</del><ins>+  SCHEDULE_AUTO_REPLY_WORK(RESOURCE_ID);
+create index SCHEDULE_AUTO_REPLY_WORK_JOB_ID on
+  SCHEDULE_AUTO_REPLY_WORK(JOB_ID);
</ins><span class="cx"> 
</span><span class="cx"> -----------------------------
</span><span class="cx"> -- Schedule Organizer Work --
</span><span class="lines">@@ -867,21 +932,23 @@
</span><span class="cx"> 
</span><span class="cx"> create table SCHEDULE_ORGANIZER_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
-  ICALENDAR_UID                                varchar(255) not null,
-  SCHEDULE_ACTION                                integer                 not null, -- Enum SCHEDULE_ACTION
</del><ins>+  JOB_ID                        integer      references JOB not null,
+  ICALENDAR_UID                 varchar(255) not null,
+  SCHEDULE_ACTION               integer      not null, -- Enum SCHEDULE_ACTION
</ins><span class="cx">   HOME_RESOURCE_ID              integer      not null references CALENDAR_HOME on delete cascade,
</span><del>-  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
</del><ins>+  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
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index SCHEDULE_ORGANIZER_WORK_HOME_RESOURCE_ID on
</span><del>-        SCHEDULE_ORGANIZER_WORK(HOME_RESOURCE_ID);
</del><ins>+  SCHEDULE_ORGANIZER_WORK(HOME_RESOURCE_ID);
</ins><span class="cx"> create index SCHEDULE_ORGANIZER_WORK_RESOURCE_ID on
</span><del>-        SCHEDULE_ORGANIZER_WORK(RESOURCE_ID);
</del><ins>+  SCHEDULE_ORGANIZER_WORK(RESOURCE_ID);
+create index SCHEDULE_ORGANIZER_WORK_JOB_ID on
+  SCHEDULE_ORGANIZER_WORK(JOB_ID);
</ins><span class="cx"> 
</span><span class="cx"> -- Enumeration of schedule actions
</span><span class="cx"> 
</span><span class="lines">@@ -901,17 +968,19 @@
</span><span class="cx"> 
</span><span class="cx"> create table SCHEDULE_REPLY_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
-  ICALENDAR_UID                                varchar(255) not null,
</del><ins>+  JOB_ID                        integer      references JOB not null,
+  ICALENDAR_UID                 varchar(255) not null,
</ins><span class="cx">   HOME_RESOURCE_ID              integer      not null references CALENDAR_HOME on delete cascade,
</span><span class="cx">   RESOURCE_ID                   integer      not null references CALENDAR_OBJECT on delete cascade,
</span><del>-  CHANGED_RIDS                               text
</del><ins>+  CHANGED_RIDS                  text
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index SCHEDULE_REPLY_WORK_HOME_RESOURCE_ID on
</span><del>-        SCHEDULE_REPLY_WORK(HOME_RESOURCE_ID);
</del><ins>+  SCHEDULE_REPLY_WORK(HOME_RESOURCE_ID);
</ins><span class="cx"> create index SCHEDULE_REPLY_WORK_RESOURCE_ID on
</span><del>-        SCHEDULE_REPLY_WORK(RESOURCE_ID);
</del><ins>+  SCHEDULE_REPLY_WORK(RESOURCE_ID);
+create index SCHEDULE_REPLY_WORK_JOB_ID on
+  SCHEDULE_REPLY_WORK(JOB_ID);
</ins><span class="cx"> 
</span><span class="cx"> --------------------------------
</span><span class="cx"> -- Schedule Reply Cancel Work --
</span><span class="lines">@@ -919,14 +988,16 @@
</span><span class="cx"> 
</span><span class="cx"> create table SCHEDULE_REPLY_CANCEL_WORK (
</span><span class="cx">   WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
</span><del>-  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
-  ICALENDAR_UID                                varchar(255) not null,
</del><ins>+  JOB_ID                        integer      references JOB not null,
+  ICALENDAR_UID                 varchar(255) not null,
</ins><span class="cx">   HOME_RESOURCE_ID              integer      not null references CALENDAR_HOME on delete cascade,
</span><del>-  ICALENDAR_TEXT                               text         not null
</del><ins>+  ICALENDAR_TEXT                text         not null
</ins><span class="cx"> );
</span><span class="cx"> 
</span><span class="cx"> create index SCHEDULE_REPLY_CANCEL_WORK_HOME_RESOURCE_ID on
</span><del>-        SCHEDULE_REPLY_CANCEL_WORK(HOME_RESOURCE_ID);
</del><ins>+  SCHEDULE_REPLY_CANCEL_WORK(HOME_RESOURCE_ID);
+create index SCHEDULE_REPLY_CANCEL_WORK_JOB_ID on
+  SCHEDULE_REPLY_CANCEL_WORK(JOB_ID);
</ins><span class="cx"> 
</span><span class="cx"> --------------------
</span><span class="cx"> -- Schema Version --
</span><span class="lines">@@ -937,7 +1008,7 @@
</span><span class="cx">   VALUE                         varchar(255)
</span><span class="cx"> );
</span><span class="cx"> 
</span><del>-insert into CALENDARSERVER values ('VERSION', '36');
</del><ins>+insert into CALENDARSERVER values ('VERSION', '37');
</ins><span class="cx"> insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '5');
</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_schemaoldoracledialectv36sql"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql (0 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql                                (rev 0)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -0,0 +1,719 @@
</span><ins>+create sequence RESOURCE_ID_SEQ;
+create sequence INSTANCE_ID_SEQ;
+create sequence ATTACHMENT_ID_SEQ;
+create sequence REVISION_SEQ;
+create sequence WORKITEM_SEQ;
+create table NODE_INFO (
+    &quot;HOSTNAME&quot; nvarchar2(255),
+    &quot;PID&quot; integer not null,
+    &quot;PORT&quot; integer not null,
+    &quot;TIME&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
+    primary key(&quot;HOSTNAME&quot;, &quot;PORT&quot;)
+);
+
+create table NAMED_LOCK (
+    &quot;LOCK_NAME&quot; nvarchar2(255) primary key
+);
+
+create table CALENDAR_HOME (
+    &quot;RESOURCE_ID&quot; integer primary key,
+    &quot;OWNER_UID&quot; nvarchar2(255) unique,
+    &quot;STATUS&quot; integer default 0 not null,
+    &quot;DATAVERSION&quot; integer default 0 not null
+);
+
+create table HOME_STATUS (
+    &quot;ID&quot; integer primary key,
+    &quot;DESCRIPTION&quot; nvarchar2(16) unique
+);
+
+insert into HOME_STATUS (DESCRIPTION, ID) values ('normal', 0);
+insert into HOME_STATUS (DESCRIPTION, ID) values ('external', 1);
+create table CALENDAR (
+    &quot;RESOURCE_ID&quot; integer primary key
+);
+
+create table CALENDAR_HOME_METADATA (
+    &quot;RESOURCE_ID&quot; integer primary key references CALENDAR_HOME on delete cascade,
+    &quot;QUOTA_USED_BYTES&quot; integer default 0 not null,
+    &quot;DEFAULT_EVENTS&quot; integer default null references CALENDAR on delete set null,
+    &quot;DEFAULT_TASKS&quot; integer default null references CALENDAR on delete set null,
+    &quot;DEFAULT_POLLS&quot; integer default null references CALENDAR on delete set null,
+    &quot;ALARM_VEVENT_TIMED&quot; nclob default null,
+    &quot;ALARM_VEVENT_ALLDAY&quot; nclob default null,
+    &quot;ALARM_VTODO_TIMED&quot; nclob default null,
+    &quot;ALARM_VTODO_ALLDAY&quot; nclob default null,
+    &quot;AVAILABILITY&quot; nclob default null,
+    &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table CALENDAR_METADATA (
+    &quot;RESOURCE_ID&quot; integer primary key references CALENDAR on delete cascade,
+    &quot;SUPPORTED_COMPONENTS&quot; nvarchar2(255) default null,
+    &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table NOTIFICATION_HOME (
+    &quot;RESOURCE_ID&quot; integer primary key,
+    &quot;OWNER_UID&quot; nvarchar2(255) unique,
+    &quot;STATUS&quot; integer default 0 not null,
+    &quot;DATAVERSION&quot; integer default 0 not null
+);
+
+create table NOTIFICATION (
+    &quot;RESOURCE_ID&quot; integer primary key,
+    &quot;NOTIFICATION_HOME_RESOURCE_ID&quot; integer not null references NOTIFICATION_HOME,
+    &quot;NOTIFICATION_UID&quot; nvarchar2(255),
+    &quot;NOTIFICATION_TYPE&quot; nvarchar2(255),
+    &quot;NOTIFICATION_DATA&quot; nclob,
+    &quot;MD5&quot; nchar(32),
+    &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
+    unique(&quot;NOTIFICATION_UID&quot;, &quot;NOTIFICATION_HOME_RESOURCE_ID&quot;)
+);
+
+create table CALENDAR_BIND (
+    &quot;CALENDAR_HOME_RESOURCE_ID&quot; integer not null references CALENDAR_HOME,
+    &quot;CALENDAR_RESOURCE_ID&quot; integer not null references CALENDAR on delete cascade,
+    &quot;EXTERNAL_ID&quot; integer default null,
+    &quot;CALENDAR_RESOURCE_NAME&quot; nvarchar2(255),
+    &quot;BIND_MODE&quot; integer not null,
+    &quot;BIND_STATUS&quot; integer not null,
+    &quot;BIND_REVISION&quot; integer default 0 not null,
+    &quot;MESSAGE&quot; nclob,
+    &quot;TRANSP&quot; integer default 0 not null,
+    &quot;ALARM_VEVENT_TIMED&quot; nclob default null,
+    &quot;ALARM_VEVENT_ALLDAY&quot; nclob default null,
+    &quot;ALARM_VTODO_TIMED&quot; nclob default null,
+    &quot;ALARM_VTODO_ALLDAY&quot; nclob default null,
+    &quot;TIMEZONE&quot; nclob default null, 
+    primary key(&quot;CALENDAR_HOME_RESOURCE_ID&quot;, &quot;CALENDAR_RESOURCE_ID&quot;), 
+    unique(&quot;CALENDAR_HOME_RESOURCE_ID&quot;, &quot;CALENDAR_RESOURCE_NAME&quot;)
+);
+
+create table CALENDAR_BIND_MODE (
+    &quot;ID&quot; integer primary key,
+    &quot;DESCRIPTION&quot; 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);
+create table CALENDAR_BIND_STATUS (
+    &quot;ID&quot; integer primary key,
+    &quot;DESCRIPTION&quot; 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 (
+    &quot;ID&quot; integer primary key,
+    &quot;DESCRIPTION&quot; 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 (
+    &quot;RESOURCE_ID&quot; integer primary key,
+    &quot;CALENDAR_RESOURCE_ID&quot; integer not null references CALENDAR on delete cascade,
+    &quot;RESOURCE_NAME&quot; nvarchar2(255),
+    &quot;ICALENDAR_TEXT&quot; nclob,
+    &quot;ICALENDAR_UID&quot; nvarchar2(255),
+    &quot;ICALENDAR_TYPE&quot; nvarchar2(255),
+    &quot;ATTACHMENTS_MODE&quot; integer default 0 not null,
+    &quot;DROPBOX_ID&quot; nvarchar2(255),
+    &quot;ORGANIZER&quot; nvarchar2(255),
+    &quot;RECURRANCE_MIN&quot; date,
+    &quot;RECURRANCE_MAX&quot; date,
+    &quot;ACCESS&quot; integer default 0 not null,
+    &quot;SCHEDULE_OBJECT&quot; integer default 0,
+    &quot;SCHEDULE_TAG&quot; nvarchar2(36) default null,
+    &quot;SCHEDULE_ETAGS&quot; nclob default null,
+    &quot;PRIVATE_COMMENTS&quot; integer default 0 not null,
+    &quot;MD5&quot; nchar(32),
+    &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
+    unique(&quot;CALENDAR_RESOURCE_ID&quot;, &quot;RESOURCE_NAME&quot;)
+);
+
+create table CALENDAR_OBJECT_ATTACHMENTS_MO (
+    &quot;ID&quot; integer primary key,
+    &quot;DESCRIPTION&quot; nvarchar2(16) unique
+);
+
+insert into CALENDAR_OBJECT_ATTACHMENTS_MO (DESCRIPTION, ID) values ('none', 0);
+insert into CALENDAR_OBJECT_ATTACHMENTS_MO (DESCRIPTION, ID) values ('read', 1);
+insert into CALENDAR_OBJECT_ATTACHMENTS_MO (DESCRIPTION, ID) values ('write', 2);
+create table CALENDAR_ACCESS_TYPE (
+    &quot;ID&quot; integer primary key,
+    &quot;DESCRIPTION&quot; 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 (
+    &quot;INSTANCE_ID&quot; integer primary key,
+    &quot;CALENDAR_RESOURCE_ID&quot; integer not null references CALENDAR on delete cascade,
+    &quot;CALENDAR_OBJECT_RESOURCE_ID&quot; integer not null references CALENDAR_OBJECT on delete cascade,
+    &quot;FLOATING&quot; integer not null,
+    &quot;START_DATE&quot; timestamp not null,
+    &quot;END_DATE&quot; timestamp not null,
+    &quot;FBTYPE&quot; integer not null,
+    &quot;TRANSPARENT&quot; integer not null
+);
+
+create table FREE_BUSY_TYPE (
+    &quot;ID&quot; integer primary key,
+    &quot;DESCRIPTION&quot; 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 TRANSPARENCY (
+    &quot;TIME_RANGE_INSTANCE_ID&quot; integer not null references TIME_RANGE on delete cascade,
+    &quot;USER_ID&quot; nvarchar2(255),
+    &quot;TRANSPARENT&quot; integer not null
+);
+
+create table ATTACHMENT (
+    &quot;ATTACHMENT_ID&quot; integer primary key,
+    &quot;CALENDAR_HOME_RESOURCE_ID&quot; integer not null references CALENDAR_HOME,
+    &quot;DROPBOX_ID&quot; nvarchar2(255),
+    &quot;CONTENT_TYPE&quot; nvarchar2(255),
+    &quot;SIZE&quot; integer not null,
+    &quot;MD5&quot; nchar(32),
+    &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;PATH&quot; nvarchar2(1024)
+);
+
+create table ATTACHMENT_CALENDAR_OBJECT (
+    &quot;ATTACHMENT_ID&quot; integer not null references ATTACHMENT on delete cascade,
+    &quot;MANAGED_ID&quot; nvarchar2(255),
+    &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;), 
+    unique(&quot;MANAGED_ID&quot;, &quot;CALENDAR_OBJECT_RESOURCE_ID&quot;)
+);
+
+create table RESOURCE_PROPERTY (
+    &quot;RESOURCE_ID&quot; integer not null,
+    &quot;NAME&quot; nvarchar2(255),
+    &quot;VALUE&quot; nclob,
+    &quot;VIEWER_UID&quot; nvarchar2(255), 
+    primary key(&quot;RESOURCE_ID&quot;, &quot;NAME&quot;, &quot;VIEWER_UID&quot;)
+);
+
+create table ADDRESSBOOK_HOME (
+    &quot;RESOURCE_ID&quot; integer primary key,
+    &quot;ADDRESSBOOK_PROPERTY_STORE_ID&quot; integer not null,
+    &quot;OWNER_UID&quot; nvarchar2(255) unique,
+    &quot;STATUS&quot; integer default 0 not null,
+    &quot;DATAVERSION&quot; integer default 0 not null
+);
+
+create table ADDRESSBOOK_HOME_METADATA (
+    &quot;RESOURCE_ID&quot; integer primary key references ADDRESSBOOK_HOME on delete cascade,
+    &quot;QUOTA_USED_BYTES&quot; integer default 0 not null,
+    &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table SHARED_ADDRESSBOOK_BIND (
+    &quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot; integer not null references ADDRESSBOOK_HOME,
+    &quot;OWNER_HOME_RESOURCE_ID&quot; integer not null references ADDRESSBOOK_HOME on delete cascade,
+    &quot;EXTERNAL_ID&quot; integer default null,
+    &quot;ADDRESSBOOK_RESOURCE_NAME&quot; nvarchar2(255),
+    &quot;BIND_MODE&quot; integer not null,
+    &quot;BIND_STATUS&quot; integer not null,
+    &quot;BIND_REVISION&quot; integer default 0 not null,
+    &quot;MESSAGE&quot; nclob, 
+    primary key(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;OWNER_HOME_RESOURCE_ID&quot;), 
+    unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;ADDRESSBOOK_RESOURCE_NAME&quot;)
+);
+
+create table ADDRESSBOOK_OBJECT (
+    &quot;RESOURCE_ID&quot; integer primary key,
+    &quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot; integer not null references ADDRESSBOOK_HOME on delete cascade,
+    &quot;RESOURCE_NAME&quot; nvarchar2(255),
+    &quot;VCARD_TEXT&quot; nclob,
+    &quot;VCARD_UID&quot; nvarchar2(255),
+    &quot;KIND&quot; integer not null,
+    &quot;MD5&quot; nchar(32),
+    &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
+    unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;RESOURCE_NAME&quot;), 
+    unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;VCARD_UID&quot;)
+);
+
+create table ADDRESSBOOK_OBJECT_KIND (
+    &quot;ID&quot; integer primary key,
+    &quot;DESCRIPTION&quot; 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 (
+    &quot;GROUP_ID&quot; integer not null,
+    &quot;ADDRESSBOOK_ID&quot; integer not null references ADDRESSBOOK_HOME on delete cascade,
+    &quot;MEMBER_ID&quot; integer not null,
+    &quot;REVISION&quot; integer not null,
+    &quot;REMOVED&quot; integer default 0 not null,
+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
+    primary key(&quot;GROUP_ID&quot;, &quot;MEMBER_ID&quot;, &quot;REVISION&quot;)
+);
+
+create table ABO_FOREIGN_MEMBERS (
+    &quot;GROUP_ID&quot; integer not null references ADDRESSBOOK_OBJECT on delete cascade,
+    &quot;ADDRESSBOOK_ID&quot; integer not null references ADDRESSBOOK_HOME on delete cascade,
+    &quot;MEMBER_ADDRESS&quot; nvarchar2(255), 
+    primary key(&quot;GROUP_ID&quot;, &quot;MEMBER_ADDRESS&quot;)
+);
+
+create table SHARED_GROUP_BIND (
+    &quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot; integer not null references ADDRESSBOOK_HOME,
+    &quot;GROUP_RESOURCE_ID&quot; integer not null references ADDRESSBOOK_OBJECT on delete cascade,
+    &quot;EXTERNAL_ID&quot; integer default null,
+    &quot;GROUP_ADDRESSBOOK_NAME&quot; nvarchar2(255),
+    &quot;BIND_MODE&quot; integer not null,
+    &quot;BIND_STATUS&quot; integer not null,
+    &quot;BIND_REVISION&quot; integer default 0 not null,
+    &quot;MESSAGE&quot; nclob, 
+    primary key(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;GROUP_RESOURCE_ID&quot;), 
+    unique(&quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot;, &quot;GROUP_ADDRESSBOOK_NAME&quot;)
+);
+
+create table CALENDAR_OBJECT_REVISIONS (
+    &quot;CALENDAR_HOME_RESOURCE_ID&quot; integer not null references CALENDAR_HOME,
+    &quot;CALENDAR_RESOURCE_ID&quot; integer references CALENDAR,
+    &quot;CALENDAR_NAME&quot; nvarchar2(255) default null,
+    &quot;RESOURCE_NAME&quot; nvarchar2(255),
+    &quot;REVISION&quot; integer not null,
+    &quot;DELETED&quot; integer not null,
+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table ADDRESSBOOK_OBJECT_REVISIONS (
+    &quot;ADDRESSBOOK_HOME_RESOURCE_ID&quot; integer not null references ADDRESSBOOK_HOME,
+    &quot;OWNER_HOME_RESOURCE_ID&quot; integer references ADDRESSBOOK_HOME,
+    &quot;ADDRESSBOOK_NAME&quot; nvarchar2(255) default null,
+    &quot;OBJECT_RESOURCE_ID&quot; integer default 0,
+    &quot;RESOURCE_NAME&quot; nvarchar2(255),
+    &quot;REVISION&quot; integer not null,
+    &quot;DELETED&quot; integer not null,
+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table NOTIFICATION_OBJECT_REVISIONS (
+    &quot;NOTIFICATION_HOME_RESOURCE_ID&quot; integer not null references NOTIFICATION_HOME on delete cascade,
+    &quot;RESOURCE_NAME&quot; nvarchar2(255),
+    &quot;REVISION&quot; integer not null,
+    &quot;DELETED&quot; integer not null,
+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
+    unique(&quot;NOTIFICATION_HOME_RESOURCE_ID&quot;, &quot;RESOURCE_NAME&quot;)
+);
+
+create table APN_SUBSCRIPTIONS (
+    &quot;TOKEN&quot; nvarchar2(255),
+    &quot;RESOURCE_KEY&quot; nvarchar2(255),
+    &quot;MODIFIED&quot; integer not null,
+    &quot;SUBSCRIBER_GUID&quot; nvarchar2(255),
+    &quot;USER_AGENT&quot; nvarchar2(255) default null,
+    &quot;IP_ADDR&quot; nvarchar2(255) default null, 
+    primary key(&quot;TOKEN&quot;, &quot;RESOURCE_KEY&quot;)
+);
+
+create table IMIP_TOKENS (
+    &quot;TOKEN&quot; nvarchar2(255),
+    &quot;ORGANIZER&quot; nvarchar2(255),
+    &quot;ATTENDEE&quot; nvarchar2(255),
+    &quot;ICALUID&quot; nvarchar2(255),
+    &quot;ACCESSED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
+    primary key(&quot;ORGANIZER&quot;, &quot;ATTENDEE&quot;, &quot;ICALUID&quot;)
+);
+
+create table IMIP_INVITATION_WORK (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;FROM_ADDR&quot; nvarchar2(255),
+    &quot;TO_ADDR&quot; nvarchar2(255),
+    &quot;ICALENDAR_TEXT&quot; nclob
+);
+
+create table IMIP_POLLING_WORK (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table IMIP_REPLY_WORK (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;ORGANIZER&quot; nvarchar2(255),
+    &quot;ATTENDEE&quot; nvarchar2(255),
+    &quot;ICALENDAR_TEXT&quot; nclob
+);
+
+create table PUSH_NOTIFICATION_WORK (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;PUSH_ID&quot; nvarchar2(255),
+    &quot;PRIORITY&quot; integer not null
+);
+
+create table GROUP_CACHER_POLLING_WORK (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table GROUP_REFRESH_WORK (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;GROUP_GUID&quot; nvarchar2(255)
+);
+
+create table GROUP_ATTENDEE_RECONCILIATION_ (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;RESOURCE_ID&quot; integer,
+    &quot;GROUP_ID&quot; integer
+);
+
+create table GROUPS (
+    &quot;GROUP_ID&quot; integer primary key,
+    &quot;NAME&quot; nvarchar2(255),
+    &quot;GROUP_GUID&quot; nvarchar2(255),
+    &quot;MEMBERSHIP_HASH&quot; nvarchar2(255),
+    &quot;EXTANT&quot; integer default 1,
+    &quot;CREATED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;MODIFIED&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table GROUP_MEMBERSHIP (
+    &quot;GROUP_ID&quot; integer,
+    &quot;MEMBER_GUID&quot; nvarchar2(255)
+);
+
+create table GROUP_ATTENDEE (
+    &quot;GROUP_ID&quot; integer,
+    &quot;RESOURCE_ID&quot; integer,
+    &quot;MEMBERSHIP_HASH&quot; nvarchar2(255)
+);
+
+create table DELEGATES (
+    &quot;DELEGATOR&quot; nvarchar2(255),
+    &quot;DELEGATE&quot; nvarchar2(255),
+    &quot;READ_WRITE&quot; integer not null
+);
+
+create table DELEGATE_GROUPS (
+    &quot;DELEGATOR&quot; nvarchar2(255),
+    &quot;GROUP_ID&quot; integer not null,
+    &quot;READ_WRITE&quot; integer not null,
+    &quot;IS_EXTERNAL&quot; integer not null
+);
+
+create table EXTERNAL_DELEGATE_GROUPS (
+    &quot;DELEGATOR&quot; nvarchar2(255),
+    &quot;GROUP_GUID_READ&quot; nvarchar2(255),
+    &quot;GROUP_GUID_WRITE&quot; nvarchar2(255)
+);
+
+create table CALENDAR_OBJECT_SPLITTER_WORK (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;RESOURCE_ID&quot; integer not null references CALENDAR_OBJECT on delete cascade
+);
+
+create table FIND_MIN_VALID_REVISION_WORK (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table REVISION_CLEANUP_WORK (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table INBOX_CLEANUP_WORK (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC'
+);
+
+create table CLEANUP_ONE_INBOX_WORK (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;HOME_ID&quot; integer not null unique references CALENDAR_HOME on delete cascade
+);
+
+create table SCHEDULE_REFRESH_WORK (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;ICALENDAR_UID&quot; nvarchar2(255),
+    &quot;HOME_RESOURCE_ID&quot; integer not null references CALENDAR_HOME on delete cascade,
+    &quot;RESOURCE_ID&quot; integer not null references CALENDAR_OBJECT on delete cascade,
+    &quot;ATTENDEE_COUNT&quot; integer
+);
+
+create table SCHEDULE_REFRESH_ATTENDEES (
+    &quot;RESOURCE_ID&quot; integer not null references CALENDAR_OBJECT on delete cascade,
+    &quot;ATTENDEE&quot; nvarchar2(255)
+);
+
+create table SCHEDULE_AUTO_REPLY_WORK (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;ICALENDAR_UID&quot; nvarchar2(255),
+    &quot;HOME_RESOURCE_ID&quot; integer not null references CALENDAR_HOME on delete cascade,
+    &quot;RESOURCE_ID&quot; integer not null references CALENDAR_OBJECT on delete cascade,
+    &quot;PARTSTAT&quot; nvarchar2(255)
+);
+
+create table SCHEDULE_ORGANIZER_WORK (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;ICALENDAR_UID&quot; nvarchar2(255),
+    &quot;SCHEDULE_ACTION&quot; integer not null,
+    &quot;HOME_RESOURCE_ID&quot; integer not null references CALENDAR_HOME on delete cascade,
+    &quot;RESOURCE_ID&quot; integer,
+    &quot;ICALENDAR_TEXT_OLD&quot; nclob,
+    &quot;ICALENDAR_TEXT_NEW&quot; nclob,
+    &quot;ATTENDEE_COUNT&quot; integer,
+    &quot;SMART_MERGE&quot; integer
+);
+
+create table SCHEDULE_ACTION (
+    &quot;ID&quot; integer primary key,
+    &quot;DESCRIPTION&quot; 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_REPLY_WORK (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;ICALENDAR_UID&quot; nvarchar2(255),
+    &quot;HOME_RESOURCE_ID&quot; integer not null references CALENDAR_HOME on delete cascade,
+    &quot;RESOURCE_ID&quot; integer not null references CALENDAR_OBJECT on delete cascade,
+    &quot;CHANGED_RIDS&quot; nclob
+);
+
+create table SCHEDULE_REPLY_CANCEL_WORK (
+    &quot;WORK_ID&quot; integer primary key not null,
+    &quot;NOT_BEFORE&quot; timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+    &quot;ICALENDAR_UID&quot; nvarchar2(255),
+    &quot;HOME_RESOURCE_ID&quot; integer not null references CALENDAR_HOME on delete cascade,
+    &quot;ICALENDAR_TEXT&quot; nclob
+);
+
+create table CALENDARSERVER (
+    &quot;NAME&quot; nvarchar2(255) primary key,
+    &quot;VALUE&quot; nvarchar2(255)
+);
+
+insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '36');
+insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '5');
+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 TRANSPARENCY_TIME_RAN_5f34467f on TRANSPARENCY (
+    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 GROUPS_GROUP_GUID_ebf7a1d4 on GROUPS (
+    GROUP_GUID
+);
+
+create index GROUP_MEMBERSHIP_GROU_9560a5e6 on GROUP_MEMBERSHIP (
+    GROUP_ID
+);
+
+create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
+    MEMBER_GUID
+);
+
+create index CALENDAR_OBJECT_SPLIT_af71dcda on CALENDAR_OBJECT_SPLITTER_WORK (
+    RESOURCE_ID
+);
+
+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_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
+);
+
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaoldpostgresdialectv36sql"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql (0 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql                                (rev 0)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -0,0 +1,944 @@
</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 &quot;License&quot;);
+-- 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 &quot;AS IS&quot; 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
+);
+
+
+-------------------
+-- 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');
+
+
+--------------
+-- 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');
+
+-- 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_OBJECT_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),
+
+  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_OBJECT_ATTACHMENTS_MODE (
+  ID          integer     primary key,
+  DESCRIPTION varchar(16) not null unique
+);
+
+insert into CALENDAR_OBJECT_ATTACHMENTS_MODE values (0, 'none' );
+insert into CALENDAR_OBJECT_ATTACHMENTS_MODE values (1, 'read' );
+insert into CALENDAR_OBJECT_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'  );
+
+
+------------------
+-- Transparency --
+------------------
+
+create table TRANSPARENCY (
+  TIME_RANGE_INSTANCE_ID      integer      not null references TIME_RANGE on delete cascade,
+  USER_ID                     varchar(255) not null,
+  TRANSPARENT                 boolean      not null
+);
+
+create index TRANSPARENCY_TIME_RANGE_INSTANCE_ID on
+  TRANSPARENCY(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),
+
+  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
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
+  FROM_ADDR                     varchar(255) not null,
+  TO_ADDR                       varchar(255) not null,
+  ICALENDAR_TEXT                text         not null
+);
+
+
+-----------------------
+-- IMIP Polling Work --
+-----------------------
+
+create table IMIP_POLLING_WORK (
+  WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP)
+);
+
+
+---------------------
+-- IMIP Reply Work --
+---------------------
+
+create table IMIP_REPLY_WORK (
+  WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
+  ORGANIZER                     varchar(255) not null,
+  ATTENDEE                      varchar(255) not null,
+  ICALENDAR_TEXT                text         not null
+);
+
+
+------------------------
+-- Push Notifications --
+------------------------
+
+create table PUSH_NOTIFICATION_WORK (
+  WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
+  PUSH_ID                       varchar(255) not null,
+  PRIORITY                      integer      not null -- 1:low 5:medium 10:high
+);
+
+-----------------
+-- GroupCacher --
+-----------------
+
+create table GROUP_CACHER_POLLING_WORK (
+  WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP)
+);
+
+create table GROUP_REFRESH_WORK (
+  WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
+  GROUP_GUID                    varchar(255) not null
+);
+
+create table GROUP_ATTENDEE_RECONCILIATION_WORK (
+  WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
+  RESOURCE_ID                   integer,
+  GROUP_ID                      integer
+);
+
+
+create table GROUPS (
+  GROUP_ID                      integer      primary key default nextval('RESOURCE_ID_SEQ'),    -- implicit index
+  NAME                          varchar(255) not null,
+  GROUP_GUID                    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_GUID on GROUPS(GROUP_GUID);
+
+create table GROUP_MEMBERSHIP (
+  GROUP_ID                      integer,
+  MEMBER_GUID                   varchar(255) not null
+);
+create index GROUP_MEMBERSHIP_GROUP on GROUP_MEMBERSHIP(GROUP_ID);
+create index GROUP_MEMBERSHIP_MEMBER on GROUP_MEMBERSHIP(MEMBER_GUID);
+
+create table GROUP_ATTENDEE (
+  GROUP_ID                      integer,
+  RESOURCE_ID                   integer,
+  MEMBERSHIP_HASH               varchar(255) not null
+);
+
+---------------
+-- Delegates --
+---------------
+
+create table DELEGATES (
+  DELEGATOR                     varchar(255) not null,
+  DELEGATE                      varchar(255) not null,
+  READ_WRITE                    integer      not null -- 1 = ReadWrite, 0 = ReadOnly
+);
+
+create table DELEGATE_GROUPS (
+  DELEGATOR                     varchar(255) not null,
+  GROUP_ID                      integer      not null,
+  READ_WRITE                    integer      not null, -- 1 = ReadWrite, 0 = ReadOnly
+  IS_EXTERNAL                   integer      not null -- 1 = ReadWrite, 0 = ReadOnly
+);
+
+create table EXTERNAL_DELEGATE_GROUPS (
+  DELEGATOR                     varchar(255) not null,
+  GROUP_GUID_READ               varchar(255),
+  GROUP_GUID_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
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
+  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);
+
+---------------------------
+-- Revision Cleanup Work --
+---------------------------
+
+create table FIND_MIN_VALID_REVISION_WORK (
+  WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP)
+);
+
+create table REVISION_CLEANUP_WORK (
+  WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP)
+);
+
+------------------------
+-- Inbox Cleanup Work --
+------------------------
+
+create table INBOX_CLEANUP_WORK (
+  WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP)
+);
+
+create table CLEANUP_ONE_INBOX_WORK (
+  WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
+  HOME_ID                                      integer      not null unique references CALENDAR_HOME on delete cascade
+);
+
+---------------------------
+-- Schedule Refresh Work --
+---------------------------
+
+create table SCHEDULE_REFRESH_WORK (
+  WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
+  ICALENDAR_UID                                varchar(255) not null,
+  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
+);
+
+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 default nextval('WORKITEM_SEQ') not null, -- implicit index
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
+  ICALENDAR_UID                                varchar(255) not null,
+  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 default nextval('WORKITEM_SEQ') not null, -- implicit index
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
+  ICALENDAR_UID                                varchar(255) not null,
+  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 Reply Work --
+-------------------------
+
+create table SCHEDULE_REPLY_WORK (
+  WORK_ID                       integer      primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
+  ICALENDAR_UID                                varchar(255) not null,
+  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 default nextval('WORKITEM_SEQ') not null, -- implicit index
+  NOT_BEFORE                    timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
+  ICALENDAR_UID                                varchar(255) not null,
+  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);
+
+--------------------
+-- Schema Version --
+--------------------
+
+create table CALENDARSERVER (
+  NAME                          varchar(255) primary key, -- implicit index
+  VALUE                         varchar(255)
+);
+
+insert into CALENDARSERVER values ('VERSION', '36');
+insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '5');
+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_36_to_37sql"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_36_to_37.sql (0 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_36_to_37.sql                                (rev 0)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_36_to_37.sql        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -0,0 +1,372 @@
</span><ins>+----
+-- Copyright (c) 2012-2014 Apple Inc. All rights reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+-- 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 &quot;AS IS&quot; 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 36 to 37 --
+---------------------------------------------------
+
+------------------------
+-- Inbox Cleanup Work --
+------------------------
+
+create sequence JOB_SEQ;
+
+create table JOB (
+    &quot;JOB_ID&quot; integer primary key not null,
+    &quot;WORK_TYPE&quot; nvarchar2(255),
+    &quot;PRIORITY&quot; integer default 0,
+    &quot;WEIGHT&quot; integer default 0,
+    &quot;NOT_BEFORE&quot; timestamp default null,
+    &quot;NOT_AFTER&quot; timestamp default null
+);
+
+create or replace function next_job return integer is
+  cursor c1 is select ID from JOB for update skip locked;
+  result integer;
+begin
+  open c1;
+  fetch c1 into result;
+  select ID from JOB where ID = result for update;
+  return result;
+end;
+/
+
+
+-- IMIP_INVITATION_WORK --
+alter table IMIP_INVITATION_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update IMIP_INVITATION_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'IMIP_INVITATION_WORK', NOT_BEFORE from IMIP_INVITATION_WORK);
+
+alter table IMIP_INVITATION_WORK
+    drop column NOT_BEFORE;
+alter table IMIP_INVITATION_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index IMIP_INVITATION_WORK__586d064c on IMIP_INVITATION_WORK (
+    JOB_ID
+);
+
+
+-- IMIP_POLLING_WORK --
+alter table IMIP_POLLING_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update IMIP_POLLING_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'IMIP_POLLING_WORK', NOT_BEFORE from IMIP_POLLING_WORK);
+
+alter table IMIP_POLLING_WORK
+    drop column NOT_BEFORE;
+alter table IMIP_POLLING_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index IMIP_POLLING_WORK_JOB_d5535891 on IMIP_POLLING_WORK (
+    JOB_ID
+);
+
+
+-- IMIP_REPLY_WORK --
+alter table IMIP_REPLY_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update IMIP_REPLY_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'IMIP_REPLY_WORK', NOT_BEFORE from IMIP_REPLY_WORK);
+
+alter table IMIP_REPLY_WORK
+    drop column NOT_BEFORE;
+alter table IMIP_REPLY_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index IMIP_REPLY_WORK_JOB_I_bf4ae73e on IMIP_REPLY_WORK (
+    JOB_ID
+);
+
+
+-- PUSH_NOTIFICATION_WORK --
+alter table PUSH_NOTIFICATION_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update PUSH_NOTIFICATION_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'PUSH_NOTIFICATION_WORK', NOT_BEFORE from PUSH_NOTIFICATION_WORK);
+
+alter table PUSH_NOTIFICATION_WORK
+    drop column NOT_BEFORE;
+alter table PUSH_NOTIFICATION_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index PUSH_NOTIFICATION_WOR_8bbab117 on PUSH_NOTIFICATION_WORK (
+    JOB_ID
+);
+
+
+-- GROUP_CACHER_POLLING_WORK --
+alter table GROUP_CACHER_POLLING_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update GROUP_CACHER_POLLING_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'GROUP_CACHER_POLLING_WORK', NOT_BEFORE from GROUP_CACHER_POLLING_WORK);
+
+alter table GROUP_CACHER_POLLING_WORK
+    drop column NOT_BEFORE;
+alter table GROUP_CACHER_POLLING_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index GROUP_CACHER_POLLING__6eb3151c on GROUP_CACHER_POLLING_WORK (
+    JOB_ID
+);
+
+
+-- GROUP_REFRESH_WORK --
+alter table GROUP_REFRESH_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update GROUP_REFRESH_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'GROUP_REFRESH_WORK', NOT_BEFORE from GROUP_REFRESH_WORK);
+
+alter table GROUP_REFRESH_WORK
+    drop column NOT_BEFORE;
+alter table GROUP_REFRESH_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index GROUP_REFRESH_WORK_JO_717ede20 on GROUP_REFRESH_WORK (
+    JOB_ID
+);
+
+
+-- GROUP_ATTENDEE_RECONCILIATION_WORK --
+alter table GROUP_ATTENDEE_RECONCILIATION_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update GROUP_ATTENDEE_RECONCILIATION_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'GROUP_ATTENDEE_RECONCILIATION_WORK', NOT_BEFORE from GROUP_ATTENDEE_RECONCILIATION_WORK);
+
+alter table GROUP_ATTENDEE_RECONCILIATION_WORK
+    drop column NOT_BEFORE;
+alter table GROUP_ATTENDEE_RECONCILIATION_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index GROUP_ATTENDEE_RECONC_cd2d61b9 on GROUP_ATTENDEE_RECONCILIATION_WORK (
+    JOB_ID
+);
+
+
+-- CALENDAR_OBJECT_SPLITTER_WORK --
+alter table CALENDAR_OBJECT_SPLITTER_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update CALENDAR_OBJECT_SPLITTER_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'CALENDAR_OBJECT_SPLITTER_WORK', NOT_BEFORE from CALENDAR_OBJECT_SPLITTER_WORK);
+
+alter table CALENDAR_OBJECT_SPLITTER_WORK
+    drop column NOT_BEFORE;
+alter table CALENDAR_OBJECT_SPLITTER_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index CALENDAR_OBJECT_SPLIT_33603b72 on CALENDAR_OBJECT_SPLITTER_WORK (
+    JOB_ID
+);
+
+
+-- FIND_MIN_VALID_REVISION_WORK --
+alter table FIND_MIN_VALID_REVISION_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update FIND_MIN_VALID_REVISION_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'FIND_MIN_VALID_REVISION_WORK', NOT_BEFORE from FIND_MIN_VALID_REVISION_WORK);
+
+alter table FIND_MIN_VALID_REVISION_WORK
+    drop column NOT_BEFORE;
+alter table FIND_MIN_VALID_REVISION_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index FIND_MIN_VALID_REVISI_78d17400 on FIND_MIN_VALID_REVISION_WORK (
+    JOB_ID
+);
+
+
+-- REVISION_CLEANUP_WORK --
+alter table REVISION_CLEANUP_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update REVISION_CLEANUP_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'REVISION_CLEANUP_WORK', NOT_BEFORE from REVISION_CLEANUP_WORK);
+
+alter table REVISION_CLEANUP_WORK
+    drop column NOT_BEFORE;
+alter table REVISION_CLEANUP_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index REVISION_CLEANUP_WORK_eb062686 on REVISION_CLEANUP_WORK (
+    JOB_ID
+);
+
+
+-- INBOX_CLEANUP_WORK --
+alter table INBOX_CLEANUP_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update INBOX_CLEANUP_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'INBOX_CLEANUP_WORK', NOT_BEFORE from INBOX_CLEANUP_WORK);
+
+alter table INBOX_CLEANUP_WORK
+    drop column NOT_BEFORE;
+alter table INBOX_CLEANUP_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index INBOX_CLEANUP_WORK_JO_799132bd on INBOX_CLEANUP_WORK (
+    JOB_ID
+);
+
+
+-- CLEANUP_ONE_INBOX_WORK --
+alter table CLEANUP_ONE_INBOX_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update CLEANUP_ONE_INBOX_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'CLEANUP_ONE_INBOX_WORK', NOT_BEFORE from CLEANUP_ONE_INBOX_WORK);
+
+alter table CLEANUP_ONE_INBOX_WORK
+    drop column NOT_BEFORE;
+alter table CLEANUP_ONE_INBOX_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index CLEANUP_ONE_INBOX_WOR_375dac36 on CLEANUP_ONE_INBOX_WORK (
+    JOB_ID
+);
+
+
+-- SCHEDULE_REFRESH_WORK --
+alter table SCHEDULE_REFRESH_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update SCHEDULE_REFRESH_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_REFRESH_WORK', NOT_BEFORE from SCHEDULE_REFRESH_WORK);
+
+alter table SCHEDULE_REFRESH_WORK
+    drop column NOT_BEFORE;
+alter table SCHEDULE_REFRESH_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index SCHEDULE_REFRESH_WORK_3ffa2718 on SCHEDULE_REFRESH_WORK (
+    JOB_ID
+);
+
+
+-- SCHEDULE_AUTO_REPLY_WORK --
+alter table SCHEDULE_AUTO_REPLY_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update SCHEDULE_AUTO_REPLY_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_AUTO_REPLY_WORK', NOT_BEFORE from SCHEDULE_AUTO_REPLY_WORK);
+
+alter table SCHEDULE_AUTO_REPLY_WORK
+    drop column NOT_BEFORE;
+alter table SCHEDULE_AUTO_REPLY_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index SCHEDULE_AUTO_REPLY_W_4d7bb5a8 on SCHEDULE_AUTO_REPLY_WORK (
+    JOB_ID
+);
+
+
+-- SCHEDULE_ORGANIZER_WORK --
+alter table SCHEDULE_ORGANIZER_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update SCHEDULE_ORGANIZER_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_ORGANIZER_WORK', NOT_BEFORE from SCHEDULE_ORGANIZER_WORK);
+
+alter table SCHEDULE_ORGANIZER_WORK
+    drop column NOT_BEFORE;
+alter table SCHEDULE_ORGANIZER_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index SCHEDULE_ORGANIZER_WO_1e9f246d on SCHEDULE_ORGANIZER_WORK (
+    JOB_ID
+);
+
+
+-- SCHEDULE_REPLY_WORK --
+alter table SCHEDULE_REPLY_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update SCHEDULE_REPLY_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_REPLY_WORK', NOT_BEFORE from SCHEDULE_REPLY_WORK);
+
+alter table SCHEDULE_REPLY_WORK
+    drop column NOT_BEFORE;
+alter table SCHEDULE_REPLY_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index SCHEDULE_REPLY_WORK_J_5913b4a4 on SCHEDULE_REPLY_WORK (
+    JOB_ID
+);
+
+
+-- SCHEDULE_REPLY_CANCEL_WORK --
+alter table SCHEDULE_REPLY_CANCEL_WORK
+    add (&quot;JOB_ID&quot; integer default 0 not null);
+update SCHEDULE_REPLY_CANCEL_WORK set JOB_ID = JOB_SEQ.nextval
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_REPLY_CANCEL_WORK', NOT_BEFORE from SCHEDULE_REPLY_CANCEL_WORK);
+
+alter table SCHEDULE_REPLY_CANCEL_WORK
+    drop column NOT_BEFORE;
+alter table SCHEDULE_REPLY_CANCEL_WORK
+    add constraint foreign key (JOB_ID) references JOB;
+
+create index SCHEDULE_REPLY_CANCEL_94a0c766 on SCHEDULE_REPLY_CANCEL_WORK (
+    JOB_ID
+);
+
+
+-- update the version
+update CALENDARSERVER set VALUE = '37' where NAME = 'VERSION';
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_schemaupgradespostgresdialectupgrade_from_36_to_37sql"></a>
<div class="addfile"><h4>Added: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_36_to_37.sql (0 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_36_to_37.sql                                (rev 0)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_36_to_37.sql        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -0,0 +1,321 @@
</span><ins>+----
+-- Copyright (c) 2012-2014 Apple Inc. All rights reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+-- 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 &quot;AS IS&quot; 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 36 to 37 --
+---------------------------------------------------
+
+------------------------
+-- Inbox Cleanup Work --
+------------------------
+
+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 default null,
+  NOT_AFTER   timestamp default null
+);
+
+create or replace function next_job() returns integer as $$
+declare
+  result integer;
+begin
+  select ID into result from JOB where pg_try_advisory_xact_lock(ID) limit 1 for update;
+  return result;
+end
+$$ LANGUAGE plpgsql;
+
+
+-- IMIP_INVITATION_WORK --
+alter table IMIP_INVITATION_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'IMIP_INVITATION_WORK', NOT_BEFORE from IMIP_INVITATION_WORK);
+
+alter table IMIP_INVITATION_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index IMIP_INVITATION_WORK_JOB_ID on
+  IMIP_INVITATION_WORK(JOB_ID);
+
+
+-- IMIP_POLLING_WORK --
+alter table IMIP_POLLING_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'IMIP_POLLING_WORK', NOT_BEFORE from IMIP_POLLING_WORK);
+
+alter table IMIP_POLLING_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index IMIP_POLLING_WORK_JOB_ID on
+  IMIP_POLLING_WORK(JOB_ID);
+
+
+-- IMIP_REPLY_WORK --
+alter table IMIP_REPLY_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'IMIP_REPLY_WORK', NOT_BEFORE from IMIP_REPLY_WORK);
+
+alter table IMIP_REPLY_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index IMIP_REPLY_WORK_JOB_ID on
+  IMIP_REPLY_WORK(JOB_ID);
+
+
+-- PUSH_NOTIFICATION_WORK --
+alter table PUSH_NOTIFICATION_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+alter table PUSH_NOTIFICATION_WORK
+    rename PRIORITY to PUSH_PRIORITY;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'PUSH_NOTIFICATION_WORK', NOT_BEFORE from PUSH_NOTIFICATION_WORK);
+
+alter table PUSH_NOTIFICATION_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index PUSH_NOTIFICATION_WORK_JOB_ID on
+  PUSH_NOTIFICATION_WORK(JOB_ID);
+
+
+-- GROUP_CACHER_POLLING_WORK --
+alter table GROUP_CACHER_POLLING_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'GROUP_CACHER_POLLING_WORK', NOT_BEFORE from GROUP_CACHER_POLLING_WORK);
+
+alter table GROUP_CACHER_POLLING_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index GROUP_CACHER_POLLING_WORK_JOB_ID on
+  GROUP_CACHER_POLLING_WORK(JOB_ID);
+
+
+-- GROUP_REFRESH_WORK --
+alter table GROUP_REFRESH_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'GROUP_REFRESH_WORK', NOT_BEFORE from GROUP_REFRESH_WORK);
+
+alter table GROUP_REFRESH_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index GROUP_REFRESH_WORK_JOB_ID on
+  GROUP_REFRESH_WORK(JOB_ID);
+
+
+-- GROUP_ATTENDEE_RECONCILIATION_WORK --
+alter table GROUP_ATTENDEE_RECONCILIATION_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'GROUP_ATTENDEE_RECONCILIATION_WORK', NOT_BEFORE from GROUP_ATTENDEE_RECONCILIATION_WORK);
+
+alter table GROUP_ATTENDEE_RECONCILIATION_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index GROUP_ATTENDEE_RECONCILIATION_WORK_JOB_ID on
+  GROUP_ATTENDEE_RECONCILIATION_WORK(JOB_ID);
+
+
+-- CALENDAR_OBJECT_SPLITTER_WORK --
+alter table CALENDAR_OBJECT_SPLITTER_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'CALENDAR_OBJECT_SPLITTER_WORK', NOT_BEFORE from CALENDAR_OBJECT_SPLITTER_WORK);
+
+alter table CALENDAR_OBJECT_SPLITTER_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index CALENDAR_OBJECT_SPLITTER_WORK_JOB_ID on
+  CALENDAR_OBJECT_SPLITTER_WORK(JOB_ID);
+
+
+-- FIND_MIN_VALID_REVISION_WORK --
+alter table FIND_MIN_VALID_REVISION_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'FIND_MIN_VALID_REVISION_WORK', NOT_BEFORE from FIND_MIN_VALID_REVISION_WORK);
+
+alter table FIND_MIN_VALID_REVISION_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index FIND_MIN_VALID_REVISION_WORK_JOB_ID on
+  FIND_MIN_VALID_REVISION_WORK(JOB_ID);
+
+
+-- REVISION_CLEANUP_WORK --
+alter table REVISION_CLEANUP_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'REVISION_CLEANUP_WORK', NOT_BEFORE from REVISION_CLEANUP_WORK);
+
+alter table REVISION_CLEANUP_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index REVISION_CLEANUP_WORK_JOB_ID on
+  REVISION_CLEANUP_WORK(JOB_ID);
+
+
+-- INBOX_CLEANUP_WORK --
+alter table INBOX_CLEANUP_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'INBOX_CLEANUP_WORK', NOT_BEFORE from INBOX_CLEANUP_WORK);
+
+alter table INBOX_CLEANUP_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index INBOX_CLEANUP_WORK_JOB_ID on
+  INBOX_CLEANUP_WORK(JOB_ID);
+
+
+-- CLEANUP_ONE_INBOX_WORK --
+alter table CLEANUP_ONE_INBOX_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'CLEANUP_ONE_INBOX_WORK', NOT_BEFORE from CLEANUP_ONE_INBOX_WORK);
+
+alter table CLEANUP_ONE_INBOX_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index CLEANUP_ONE_INBOX_WORK_JOB_ID on
+  CLEANUP_ONE_INBOX_WORK(JOB_ID);
+
+
+-- SCHEDULE_REFRESH_WORK --
+alter table SCHEDULE_REFRESH_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_REFRESH_WORK', NOT_BEFORE from SCHEDULE_REFRESH_WORK);
+
+alter table SCHEDULE_REFRESH_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index SCHEDULE_REFRESH_WORK_JOB_ID on
+  SCHEDULE_REFRESH_WORK(JOB_ID);
+
+
+-- SCHEDULE_AUTO_REPLY_WORK --
+alter table SCHEDULE_AUTO_REPLY_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_AUTO_REPLY_WORK', NOT_BEFORE from SCHEDULE_AUTO_REPLY_WORK);
+
+alter table SCHEDULE_AUTO_REPLY_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index SCHEDULE_AUTO_REPLY_WORK_JOB_ID on
+  SCHEDULE_AUTO_REPLY_WORK(JOB_ID);
+
+
+-- SCHEDULE_ORGANIZER_WORK --
+alter table SCHEDULE_ORGANIZER_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_ORGANIZER_WORK', NOT_BEFORE from SCHEDULE_ORGANIZER_WORK);
+
+alter table SCHEDULE_ORGANIZER_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index SCHEDULE_ORGANIZER_WORK_JOB_ID on
+  SCHEDULE_ORGANIZER_WORK(JOB_ID);
+
+
+-- SCHEDULE_REPLY_WORK --
+alter table SCHEDULE_REPLY_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_REPLY_WORK', NOT_BEFORE from SCHEDULE_REPLY_WORK);
+
+alter table SCHEDULE_REPLY_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index SCHEDULE_REPLY_WORK_JOB_ID on
+  SCHEDULE_REPLY_WORK(JOB_ID);
+
+
+-- SCHEDULE_REPLY_CANCEL_WORK --
+alter table SCHEDULE_REPLY_CANCEL_WORK
+    add JOB_ID  integer default nextval('JOB_SEQ') not null;
+
+insert into JOB
+  (JOB_ID, WORK_TYPE, NOT_BEFORE)
+  (select JOB_ID, 'SCHEDULE_REPLY_CANCEL_WORK', NOT_BEFORE from SCHEDULE_REPLY_CANCEL_WORK);
+
+alter table SCHEDULE_REPLY_CANCEL_WORK
+    drop column NOT_BEFORE,
+    add foreign key (JOB_ID) references JOB;
+
+create index SCHEDULE_REPLY_CANCEL_WORK_JOB_ID on
+  SCHEDULE_REPLY_CANCEL_WORK(JOB_ID);
+
+  
+-- update the version
+update CALENDARSERVER set VALUE = '37' where NAME = 'VERSION';
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresql_tablespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql_tables.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql_tables.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/common/datastore/sql_tables.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -32,20 +32,49 @@
</span><span class="cx"> from re import compile
</span><span class="cx"> import hashlib
</span><span class="cx"> 
</span><ins>+def _schemaFiles(version=None):
+    &quot;&quot;&quot;
+    Find the set of files to process, either the current set if C{version} is L{None}, otherwise look
+    for the specific version.
</ins><span class="cx"> 
</span><del>-def _populateSchema(version=None):
</del><ins>+    @param version: version identifier (e.g., &quot;v1&quot;, &quot;v2&quot; etc)
+    @type version: L{str}
</ins><span class="cx">     &quot;&quot;&quot;
</span><ins>+    if version is None:
+        currentObj = getModule(__name__).filePath.sibling(&quot;sql_schema&quot;).child(&quot;current.sql&quot;)
+        extrasObj = getModule(__name__).filePath.sibling(&quot;sql_schema&quot;).child(&quot;current-{}-extras.sql&quot;.format(ORACLE_DIALECT))
+        outObj = getModule(__name__).filePath.sibling(&quot;sql_schema&quot;).child(&quot;current-{}.sql&quot;.format(ORACLE_DIALECT))
+    else:
+        currentObj = getModule(__name__).filePath.sibling(&quot;sql_schema&quot;).child(&quot;old&quot;).child(POSTGRES_DIALECT).child(&quot;%s.sql&quot; % (version,))
+        extrasObj = getModule(__name__).filePath.sibling(&quot;sql_schema&quot;).child(&quot;old&quot;).child(ORACLE_DIALECT).child(&quot;{}-extras.sql&quot; % (version,))
+        outObj = getModule(__name__).filePath.sibling(&quot;sql_schema&quot;).child(&quot;old&quot;).child(ORACLE_DIALECT).child(&quot;{}.sql&quot; % (version,))
+
+    return currentObj, extrasObj, outObj
+
+
+
+def _populateSchema(pathObj=None):
+    &quot;&quot;&quot;
</ins><span class="cx">     Generate the global L{SchemaSyntax}.
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx"> 
</span><del>-    if version is None:
-        pathObj = getModule(__name__).filePath.sibling(&quot;sql_schema&quot;).child(&quot;current.sql&quot;)
-    else:
-        pathObj = getModule(__name__).filePath.sibling(&quot;sql_schema&quot;).child(&quot;old&quot;).child(POSTGRES_DIALECT).child(&quot;%s.sql&quot; % (version,))
</del><ins>+    if pathObj is None:
+        pathObj = _schemaFiles()[0]
</ins><span class="cx">     return SchemaSyntax(schemaFromPath(pathObj))
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+def _schemaExtras(out, extras):
+    &quot;&quot;&quot;
+    If an extras file exists, add its entire content to the output stream..
+    &quot;&quot;&quot;
+
+    if extras.exists():
+        out.write(&quot;\n-- Extras\n\n&quot;)
+        out.write(extras.getContent())
+
+
+
</ins><span class="cx"> schema = _populateSchema()
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -397,8 +426,14 @@
</span><span class="cx">         out.write(',\n    '.join([column.name for column in index.columns]))
</span><span class="cx">         out.write('\n);\n\n')
</span><span class="cx"> 
</span><ins>+    # Functions are skipped as they likely use dialect specific syntax. Instead, functions
+    # for other dialects need to be written in an &quot;extras&quot; file which will be appended to
+    # the output.
+    for function in schema.model.functions:
+        out.write(&quot;-- Skipped Function {}\n&quot;.format(function.name))
</ins><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> def splitSQLString(sqlString):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Strings which mix zero or more sql statements with zero or more pl/sql
</span><span class="lines">@@ -427,7 +462,7 @@
</span><span class="cx">             continue
</span><span class="cx">         if inPlSQL is None:
</span><span class="cx">             #if 'begin'.lower() in str(stmt).split()[0].lower():
</span><del>-            if 'begin'.lower() in str(stmt).lower():
</del><ins>+            if str(stmt).lower().strip().startswith('begin'):
</ins><span class="cx">                 inPlSQL = True
</span><span class="cx">                 aggregated += str(stmt)
</span><span class="cx">                 continue
</span><span class="lines">@@ -438,9 +473,16 @@
</span><span class="cx"> 
</span><span class="cx"> if __name__ == '__main__':
</span><span class="cx">     import sys
</span><del>-    if len(sys.argv) == 2:
-        # Argument is the name of a old/postgres-dialect file (without the .sql suffix), e.g. &quot;v4&quot;
-        schema = _populateSchema(sys.argv[1])
-    else:
-        schema = _populateSchema()
-    _translateSchema(sys.stdout, schema=schema)
</del><ins>+    version = sys.argv[1] if len(sys.argv) == 2 else None
+    current, extras, out = _schemaFiles(version)
+
+    print &quot;Reading from {}&quot;.format(current.path)
+    print &quot;Extras from  {}&quot;.format(extras.path) if extras.exists() else &quot;No extras&quot;
+    print &quot;Writing to   {}&quot;.format(out.path)
+
+    with out.open(&quot;w&quot;) as outfd:
+        schema = _populateSchema(current)
+        _translateSchema(outfd, schema=schema)
+        _schemaExtras(outfd, extras)
+
+    print &quot;Done&quot;
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoretesttest_sql_tablespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/test/test_sql_tables.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/test/test_sql_tables.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/common/datastore/test/test_sql_tables.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -379,6 +379,48 @@
</span><span class="cx">         self.assertRaises(StopIteration, result.next)
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+    def test_returnOnePlSQLAndOneSQLAndOneFunction(self):
+        &quot;&quot;&quot;
+        One sql statement and one pl/sql statement yields two separate strings
+        &quot;&quot;&quot;
+        sql = dedent(
+        '''SELECT EGM.Name, BioEntity.BioEntityId INTO AUX
+            FROM EGM
+            INNER JOIN BioEntity
+                ON EGM.name LIKE BioEntity.Name AND EGM.TypeId = BioEntity.TypeId
+            OPTION (MERGE JOIN);''')
+        sqlfn = dedent(
+        '''CREATE or REPLACE FUNCTION foobar() RETURNS integer as $$
+           DECLARE
+             result integer;
+           BEGIN
+            SELECT ID into result from JOB;
+            RETURN result;
+           END
+           $$ LANGUAGE plpgsql;''')
+        plsql = dedent(
+        '''BEGIN
+           FOR i IN 1..10 LOOP
+               IF MOD(i,2) = 0 THEN
+                   INSERT INTO temp VALUES (i, x, 'i is even');
+               ELSE
+                   INSERT INTO temp VALUES (i, x, 'i is odd');
+               END IF;
+               x := x + 100;
+           END LOOP;
+           COMMIT;
+           END;''')
+        s3 = &quot;BEGIN\nFOR i IN 1..10 LOOP\nIF MOD(i,2) = 0 THEN\nINSERT INTO temp VALUES (i, x, 'i is even');ELSE\nINSERT INTO temp VALUES (i, x, 'i is odd');END IF;x := x + 100;END LOOP;COMMIT;END;&quot;
+        result = splitSQLString(sql + sqlfn + plsql)
+        r1 = result.next()
+        self.assertEquals(r1, sql.rstrip(&quot;;&quot;))
+        r2 = result.next()
+        self.assertEquals(r2, sqlfn.rstrip(&quot;;&quot;))
+        r3 = result.next()
+        self.assertEquals(r3, s3)
+        self.assertRaises(StopIteration, result.next)
+
+
</ins><span class="cx">     def test_actualSchemaUpgrade(self):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         A real-world schema upgrade is split into the expected number of statements,
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreupgradesqltesttest_upgradepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -297,7 +297,7 @@
</span><span class="cx"> for child in test_upgrader.schemaLocation.child(&quot;old&quot;).child(POSTGRES_DIALECT).globChildren(&quot;*.sql&quot;):
</span><span class="cx">     def f(self, lchild=child):
</span><span class="cx">         return self._dbSchemaUpgrades(lchild)
</span><del>-    setattr(SchemaUpgradeTests, &quot;test_dbSchemaUpgrades_%s&quot; % (child.basename().split(&quot;.&quot;, 1)[0],), f)
</del><ins>+        setattr(SchemaUpgradeTests, &quot;test_dbSchemaUpgrades_%s&quot; % (child.basename().split(&quot;.&quot;, 1)[0],), f)
</ins><span class="cx"> 
</span><span class="cx"> # Bind test methods for each addressbook data version
</span><span class="cx"> versions = set()
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreworkinbox_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/work/inbox_cleanup.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/work/inbox_cleanup.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/common/datastore/work/inbox_cleanup.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> 
</span><span class="cx"> from twext.enterprise.dal.record import fromTable
</span><span class="cx"> from twext.enterprise.dal.syntax import Delete, Select, Count
</span><del>-from twext.enterprise.queue import WorkItem
</del><ins>+from twext.enterprise.jobqueue import WorkItem
</ins><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twistedcaldav.config import config
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreworkrevision_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/common/datastore/work/revision_cleanup.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> 
</span><span class="cx"> from twext.enterprise.dal.record import fromTable
</span><span class="cx"> from twext.enterprise.dal.syntax import Delete, Select, Max
</span><del>-from twext.enterprise.queue import WorkItem
</del><ins>+from twext.enterprise.jobqueue import WorkItem
</ins><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twistedcaldav.config import config
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreworktesttest_inbox_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/work/test/test_inbox_cleanup.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/work/test/test_inbox_cleanup.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/common/datastore/work/test/test_inbox_cleanup.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> from twext.enterprise.dal.syntax import Select, Update, Parameter
</span><del>-from twext.enterprise.queue import WorkItem
</del><ins>+from twext.enterprise.jobqueue import WorkItem
</ins><span class="cx"> from twext.python.clsprop import classproperty
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from twisted.trial.unittest import TestCase
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoreworktesttest_revision_cleanuppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/work/test/test_revision_cleanup.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/work/test/test_revision_cleanup.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/common/datastore/work/test/test_revision_cleanup.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> from twext.enterprise.dal.syntax import Select
</span><del>-from twext.enterprise.queue import WorkItem
</del><ins>+from twext.enterprise.jobqueue import WorkItem
</ins><span class="cx"> from twext.python.clsprop import classproperty
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twisted.trial.unittest import TestCase
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhogroupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/groups.py (12781 => 12782)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/groups.py        2014-03-01 16:17:48 UTC (rev 12781)
+++ CalendarServer/trunk/txdav/who/groups.py        2014-03-01 16:21:25 UTC (rev 12782)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> 
</span><span class="cx"> from twext.enterprise.dal.record import fromTable
</span><span class="cx"> from twext.enterprise.dal.syntax import Delete, Select
</span><del>-from twext.enterprise.queue import WorkItem, PeerConnectionPool
</del><ins>+from twext.enterprise.jobqueue import WorkItem, PeerConnectionPool
</ins><span class="cx"> from txdav.who.delegates import allGroupDelegates
</span><span class="cx"> from twext.who.idirectory import RecordType
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="lines">@@ -185,6 +185,7 @@
</span><span class="cx">     # TODO: Pull this over from groupcacher branch
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def expandedMembers(record, members=None, records=None):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="lines">@@ -211,6 +212,7 @@
</span><span class="cx">     returnValue(members)
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> def diffAssignments(old, new):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Compare two proxy assignment lists and return their differences in the form
</span><span class="lines">@@ -266,7 +268,6 @@
</span><span class="cx">         #     externalAssignments = (yield self.externalProxiesSource())
</span><span class="cx">         # yield self.applyExternalAssignments(txn, externalAssignments)
</span><span class="cx"> 
</span><del>-
</del><span class="cx">         # Figure out which groups matter
</span><span class="cx">         groupGUIDs = yield self.groupsToRefresh(txn)
</span><span class="cx">         self.log.debug(
</span><span class="lines">@@ -297,13 +298,13 @@
</span><span class="cx">             for (
</span><span class="cx">                 delegatorGUID, (readDelegateGUID, writeDelegateGUID)
</span><span class="cx">             ) in changed:
</span><del>-                readDelegateGroupID = writeDelegateGroupID  = None
</del><ins>+                readDelegateGroupID = writeDelegateGroupID = None
</ins><span class="cx">                 if readDelegateGUID:
</span><del>-                    readDelegateGroupID, name, hash = (
</del><ins>+                    readDelegateGroupID, _ignore_name, hash = (
</ins><span class="cx">                         yield txn.groupByGUID(readDelegateGUID)
</span><span class="cx">                     )
</span><span class="cx">                 if writeDelegateGUID:
</span><del>-                    writeDelegateGroupID, name, hash = (
</del><ins>+                    writeDelegateGroupID, _ignore_name, hash = (
</ins><span class="cx">                         yield txn.groupByGUID(writeDelegateGUID)
</span><span class="cx">                     )
</span><span class="cx">                 yield txn.assignExternalDelegates(
</span><span class="lines">@@ -317,7 +318,6 @@
</span><span class="cx">                 )
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     @inlineCallbacks
</span><span class="cx">     def refreshGroup(self, txn, groupGUID):
</span><span class="cx">         # Does the work of a per-group refresh work item
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx">         for member in members:
</span><span class="cx">             membershipHashContent.update(str(member.guid))
</span><span class="cx">         membershipHash = membershipHashContent.hexdigest()
</span><del>-        groupID, cachedName, cachedMembershipHash = (
</del><ins>+        groupID, _ignore_cachedName, cachedMembershipHash = (
</ins><span class="cx">             yield txn.groupByGUID(groupGUID)
</span><span class="cx">         )
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>