[CalendarServer-changes] [15313] CalendarServer/trunk/txdav/common/datastore/sql_schema

source_changes at macosforge.org source_changes at macosforge.org
Sun Nov 15 10:17:50 PST 2015


Revision: 15313
          http://trac.calendarserver.org//changeset/15313
Author:   cdaboo at apple.com
Date:     2015-11-15 10:17:50 -0800 (Sun, 15 Nov 2015)
Log Message:
-----------
Need some white space to keep sqlparse happy.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v10.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v11.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v12.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v13.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v14.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v15.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v16.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v17.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v18.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v19.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v20.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v21.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v22.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v23.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v24.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v25.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v26.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v27.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v28.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v29.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v3.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v30.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v31.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v32.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v33.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v34.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v37.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v38.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v39.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v4.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v5.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v6.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v7.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v8.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v9.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v10.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v11.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v12.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v13.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v14.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v15.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v16.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v17.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v18.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v19.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v20.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v21.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v22.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v23.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v24.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v25.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v26.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v27.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v28.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v29.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v3.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v30.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v31.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v32.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v33.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v34.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v37.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v38.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v39.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v4.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v48.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v49.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v5.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v50.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v51.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v52.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v53.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v54.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v55.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v56.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v57.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v58.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v6.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v7.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v8.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v9.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_11_to_12.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_12_to_13.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_15_to_16.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_19_to_20.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_34_to_35.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_47_to_48.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_4_to_5.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_5_to_6.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_6_to_7.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_11_to_12.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_30_to_31.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_39_to_40.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_47_to_48.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_4_to_5.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_5_to_6.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_6_to_7.sql

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -660,7 +660,7 @@
   DELETED                   boolean      not null,
   MODIFIED                  timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
+  unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
@@ -687,7 +687,7 @@
   DELETED                       boolean      not null,
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v10.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v10.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v10.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -47,7 +47,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -59,8 +59,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -102,7 +102,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -159,7 +159,7 @@
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "PATH" nvarchar2(1024), 
-    primary key("DROPBOX_ID", "PATH")
+    primary key ("DROPBOX_ID", "PATH")
 );
 
 create table RESOURCE_PROPERTY (
@@ -167,7 +167,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -202,8 +202,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -215,8 +215,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -242,7 +242,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -250,7 +250,7 @@
     "RESOURCE_KEY" nvarchar2(255),
     "MODIFIED" integer not null,
     "SUBSCRIBER_GUID" nvarchar2(255), 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table CALENDARSERVER (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v11.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v11.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v11.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -47,7 +47,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -59,8 +59,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -102,7 +102,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -159,7 +159,7 @@
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "PATH" nvarchar2(1024), 
-    primary key("DROPBOX_ID", "PATH")
+    primary key ("DROPBOX_ID", "PATH")
 );
 
 create table RESOURCE_PROPERTY (
@@ -167,7 +167,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -202,8 +202,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -215,8 +215,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -242,7 +242,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -252,7 +252,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table CALENDARSERVER (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v12.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v12.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v12.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -6,7 +6,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table CALENDAR_HOME (
@@ -55,7 +55,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -67,8 +67,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -110,7 +110,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -167,7 +167,7 @@
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "PATH" nvarchar2(1024), 
-    primary key("DROPBOX_ID", "PATH")
+    primary key ("DROPBOX_ID", "PATH")
 );
 
 create table RESOURCE_PROPERTY (
@@ -175,7 +175,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -210,8 +210,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -223,8 +223,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -250,7 +250,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -260,7 +260,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table CALENDARSERVER (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v13.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v13.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v13.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -7,7 +7,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table CALENDAR_HOME (
@@ -56,7 +56,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -68,8 +68,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -111,7 +111,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -175,8 +175,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -184,7 +184,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -219,8 +219,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -232,8 +232,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -259,7 +259,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -269,7 +269,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table CALENDARSERVER (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v14.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v14.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v14.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -7,7 +7,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table CALENDAR_HOME (
@@ -48,7 +48,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -58,8 +58,8 @@
     "BIND_MODE" integer not null,
     "BIND_STATUS" integer not null,
     "MESSAGE" nclob, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -101,7 +101,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -165,8 +165,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -174,7 +174,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -207,8 +207,8 @@
     "BIND_MODE" integer not null,
     "BIND_STATUS" integer not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -220,8 +220,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -247,7 +247,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -257,7 +257,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table CALENDARSERVER (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v15.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v15.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v15.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -7,7 +7,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -52,7 +52,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -62,8 +62,8 @@
     "BIND_MODE" integer not null,
     "BIND_STATUS" integer not null,
     "MESSAGE" nclob, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -105,7 +105,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -169,8 +169,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -178,7 +178,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -211,8 +211,8 @@
     "BIND_MODE" integer not null,
     "BIND_STATUS" integer not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -224,8 +224,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -251,7 +251,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -261,7 +261,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table CALENDARSERVER (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v16.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v16.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v16.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -53,7 +53,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -63,8 +63,8 @@
     "BIND_MODE" integer not null,
     "BIND_STATUS" integer not null,
     "MESSAGE" nclob, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -106,7 +106,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -170,8 +170,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -179,7 +179,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -212,8 +212,8 @@
     "BIND_MODE" integer not null,
     "BIND_STATUS" integer not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -225,8 +225,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -252,7 +252,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -262,7 +262,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -271,7 +271,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v17.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v17.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v17.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -53,7 +53,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -63,8 +63,8 @@
     "BIND_MODE" integer not null,
     "BIND_STATUS" integer not null,
     "MESSAGE" nclob, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -105,7 +105,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -169,8 +169,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -178,7 +178,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -211,8 +211,8 @@
     "BIND_MODE" integer not null,
     "BIND_STATUS" integer not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -224,8 +224,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -251,7 +251,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -261,7 +261,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -270,7 +270,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v18.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v18.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v18.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -53,7 +53,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -63,8 +63,8 @@
     "BIND_MODE" integer not null,
     "BIND_STATUS" integer not null,
     "MESSAGE" nclob, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -105,7 +105,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -169,8 +169,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -178,7 +178,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -211,8 +211,8 @@
     "BIND_MODE" integer not null,
     "BIND_STATUS" integer not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -224,8 +224,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -251,7 +251,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -261,7 +261,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -270,7 +270,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v19.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v19.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v19.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -59,7 +59,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -75,8 +75,8 @@
     "ALARM_VEVENT_ALLDAY" nclob default null,
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -124,7 +124,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -188,8 +188,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -197,7 +197,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -231,8 +231,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -244,8 +244,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -271,7 +271,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -281,7 +281,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -290,7 +290,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v20.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v20.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v20.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -59,7 +59,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -75,8 +75,8 @@
     "ALARM_VEVENT_ALLDAY" nclob default null,
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -124,7 +124,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -188,8 +188,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -197,7 +197,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -222,8 +222,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -236,8 +236,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -253,14 +253,14 @@
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT, 
-    primary key("GROUP_ID", "MEMBER_ID")
+    primary key ("GROUP_ID", "MEMBER_ID")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -271,8 +271,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -298,7 +298,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -308,7 +308,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -317,7 +317,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v21.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v21.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v21.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -59,7 +59,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -75,8 +75,8 @@
     "ALARM_VEVENT_ALLDAY" nclob default null,
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -124,7 +124,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -188,8 +188,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -197,7 +197,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -222,8 +222,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -236,8 +236,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -253,14 +253,14 @@
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT, 
-    primary key("GROUP_ID", "MEMBER_ID")
+    primary key ("GROUP_ID", "MEMBER_ID")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -271,8 +271,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -298,7 +298,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -308,7 +308,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -317,7 +317,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v22.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v22.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v22.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -60,7 +60,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -77,8 +77,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null, 
     "TIMEZONE" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -126,7 +126,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -190,8 +190,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -199,7 +199,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -224,8 +224,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -238,8 +238,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -255,14 +255,14 @@
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT, 
-    primary key("GROUP_ID", "MEMBER_ID")
+    primary key ("GROUP_ID", "MEMBER_ID")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -273,8 +273,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -300,7 +300,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -310,7 +310,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -319,7 +319,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v23.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v23.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v23.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -60,7 +60,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -77,8 +77,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -126,7 +126,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -190,8 +190,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -199,7 +199,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -224,8 +224,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -238,8 +238,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -255,14 +255,14 @@
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT, 
-    primary key("GROUP_ID", "MEMBER_ID")
+    primary key ("GROUP_ID", "MEMBER_ID")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -273,8 +273,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -300,7 +300,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -310,7 +310,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -319,7 +319,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v24.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v24.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v24.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -60,7 +60,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -77,8 +77,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -126,7 +126,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -190,8 +190,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -199,7 +199,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -224,8 +224,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -238,8 +238,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -255,14 +255,14 @@
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT, 
-    primary key("GROUP_ID", "MEMBER_ID")
+    primary key ("GROUP_ID", "MEMBER_ID")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -273,8 +273,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -300,7 +300,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -310,7 +310,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -319,7 +319,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v25.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v25.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v25.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -60,7 +60,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -77,8 +77,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -126,7 +126,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -190,8 +190,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -199,7 +199,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -224,8 +224,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -238,8 +238,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -255,14 +255,14 @@
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT, 
-    primary key("GROUP_ID", "MEMBER_ID")
+    primary key ("GROUP_ID", "MEMBER_ID")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -273,8 +273,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -300,7 +300,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -310,7 +310,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -319,7 +319,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v26.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v26.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v26.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -60,7 +60,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -77,8 +77,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -126,7 +126,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -190,8 +190,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -199,7 +199,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -224,8 +224,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -238,8 +238,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -255,14 +255,14 @@
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT, 
-    primary key("GROUP_ID", "MEMBER_ID")
+    primary key ("GROUP_ID", "MEMBER_ID")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -273,8 +273,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -300,7 +300,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -310,7 +310,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -319,7 +319,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v27.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v27.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v27.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -60,7 +60,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -77,8 +77,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -126,7 +126,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -190,8 +190,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -199,7 +199,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -224,8 +224,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -238,8 +238,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -255,14 +255,14 @@
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT, 
-    primary key("GROUP_ID", "MEMBER_ID")
+    primary key ("GROUP_ID", "MEMBER_ID")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -273,8 +273,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -300,7 +300,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -310,7 +310,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -319,7 +319,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v28.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v28.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v28.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -60,7 +60,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -77,8 +77,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -126,7 +126,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -190,8 +190,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -199,7 +199,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -224,8 +224,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -238,8 +238,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -255,14 +255,14 @@
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT, 
-    primary key("GROUP_ID", "MEMBER_ID")
+    primary key ("GROUP_ID", "MEMBER_ID")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -273,8 +273,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -300,7 +300,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -310,7 +310,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -319,7 +319,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v29.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v29.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v29.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -61,7 +61,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -78,8 +78,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -127,7 +127,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -191,8 +191,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -200,7 +200,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -225,8 +225,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -239,8 +239,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -256,14 +256,14 @@
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT, 
-    primary key("GROUP_ID", "MEMBER_ID")
+    primary key ("GROUP_ID", "MEMBER_ID")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -274,8 +274,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -301,7 +301,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -311,7 +311,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -320,7 +320,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v3.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v3.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v3.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -39,7 +39,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -51,8 +51,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -93,7 +93,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -150,7 +150,7 @@
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "PATH" nvarchar2(1024), 
-    unique("DROPBOX_ID", "PATH")
+    unique ("DROPBOX_ID", "PATH")
 );
 
 create table RESOURCE_PROPERTY (
@@ -158,7 +158,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -186,8 +186,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -199,8 +199,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -210,7 +210,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT_REVISIONS (
@@ -220,7 +220,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table NOTIFICATION_OBJECT_REVISIONS (
@@ -228,7 +228,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDARSERVER (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v30.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v30.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v30.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -62,7 +62,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -79,8 +79,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -130,7 +130,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -194,8 +194,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -203,7 +203,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -228,8 +228,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -242,8 +242,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -259,14 +259,14 @@
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT, 
-    primary key("GROUP_ID", "MEMBER_ID")
+    primary key ("GROUP_ID", "MEMBER_ID")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -277,8 +277,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -304,7 +304,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -314,7 +314,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -323,7 +323,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v31.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v31.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v31.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -62,7 +62,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -79,8 +79,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -130,7 +130,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -194,8 +194,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -203,7 +203,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -228,8 +228,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -242,8 +242,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -261,14 +261,14 @@
     "MEMBER_ID" integer not null,
     "REVISION" integer not null,
     "REMOVED" integer default 0 not null, 
-    primary key("GROUP_ID", "MEMBER_ID", "REVISION")
+    primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -279,8 +279,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -307,7 +307,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -317,7 +317,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -326,7 +326,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v32.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v32.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v32.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -71,7 +71,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -89,8 +89,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -140,7 +140,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -204,8 +204,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -213,7 +213,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -240,8 +240,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -254,8 +254,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -273,14 +273,14 @@
     "MEMBER_ID" integer not null,
     "REVISION" integer not null,
     "REMOVED" integer default 0 not null, 
-    primary key("GROUP_ID", "MEMBER_ID", "REVISION")
+    primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -292,8 +292,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -320,7 +320,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -330,7 +330,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -339,7 +339,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v33.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v33.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v33.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -71,7 +71,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -89,8 +89,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -140,7 +140,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -204,8 +204,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -213,7 +213,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -240,8 +240,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -254,8 +254,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -274,14 +274,14 @@
     "REVISION" integer not null,
     "REMOVED" integer default 0 not null,
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("GROUP_ID", "MEMBER_ID", "REVISION")
+    primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -293,8 +293,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -324,7 +324,7 @@
     "REVISION" integer not null,
     "DELETED" integer not null,
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -334,7 +334,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -343,7 +343,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v34.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v34.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v34.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -71,7 +71,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -89,8 +89,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -140,7 +140,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -204,8 +204,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -213,7 +213,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -240,8 +240,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -254,8 +254,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -274,14 +274,14 @@
     "REVISION" integer not null,
     "REMOVED" integer default 0 not null,
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("GROUP_ID", "MEMBER_ID", "REVISION")
+    primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -293,8 +293,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -324,7 +324,7 @@
     "REVISION" integer not null,
     "DELETED" integer not null,
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -334,7 +334,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -343,7 +343,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -71,7 +71,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -89,8 +89,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null,
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -140,7 +140,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -204,8 +204,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -213,7 +213,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255),
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -240,8 +240,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob,
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -254,8 +254,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -274,14 +274,14 @@
     "REVISION" integer not null,
     "REMOVED" integer default 0 not null,
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
-    primary key("GROUP_ID", "MEMBER_ID", "REVISION")
+    primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255),
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -293,8 +293,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob,
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -324,7 +324,7 @@
     "REVISION" integer not null,
     "DELETED" integer not null,
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -334,7 +334,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null,
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -343,7 +343,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (
@@ -417,7 +417,7 @@
     "DELEGATOR" nvarchar2(255),
     "DELEGATE" nvarchar2(255),
     "READ_WRITE" integer not null,
-    primary key("DELEGATOR", "READ_WRITE", "DELEGATE")
+    primary key ("DELEGATOR", "READ_WRITE", "DELEGATE")
 );
 
 create table DELEGATE_GROUPS (
@@ -425,7 +425,7 @@
     "GROUP_ID" integer not null,
     "READ_WRITE" integer not null,
     "IS_EXTERNAL" integer not null,
-    primary key("DELEGATOR", "READ_WRITE", "GROUP_ID")
+    primary key ("DELEGATOR", "READ_WRITE", "GROUP_ID")
 );
 
 create table EXTERNAL_DELEGATE_GROUPS (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -8,7 +8,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -71,7 +71,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -89,8 +89,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null,
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -140,7 +140,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -204,8 +204,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -213,7 +213,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255),
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -240,8 +240,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob,
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -254,8 +254,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -274,14 +274,14 @@
     "REVISION" integer not null,
     "REMOVED" integer default 0 not null,
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
-    primary key("GROUP_ID", "MEMBER_ID", "REVISION")
+    primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255),
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -293,8 +293,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob,
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -324,7 +324,7 @@
     "REVISION" integer not null,
     "DELETED" integer not null,
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -334,7 +334,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null,
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -343,7 +343,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (
@@ -417,7 +417,7 @@
     "DELEGATOR" nvarchar2(255),
     "DELEGATE" nvarchar2(255),
     "READ_WRITE" integer not null,
-    primary key("DELEGATOR", "READ_WRITE", "DELEGATE")
+    primary key ("DELEGATOR", "READ_WRITE", "DELEGATE")
 );
 
 create table DELEGATE_GROUPS (
@@ -425,7 +425,7 @@
     "GROUP_ID" integer not null,
     "READ_WRITE" integer not null,
     "IS_EXTERNAL" integer not null,
-    primary key("DELEGATOR", "READ_WRITE", "GROUP_ID")
+    primary key ("DELEGATOR", "READ_WRITE", "GROUP_ID")
 );
 
 create table EXTERNAL_DELEGATE_GROUPS (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v37.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v37.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v37.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -9,7 +9,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -81,7 +81,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -99,8 +99,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -150,7 +150,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -214,8 +214,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -223,7 +223,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -250,8 +250,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -264,8 +264,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -284,14 +284,14 @@
     "REVISION" integer not null,
     "REMOVED" integer default 0 not null,
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("GROUP_ID", "MEMBER_ID", "REVISION")
+    primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -303,8 +303,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -334,7 +334,7 @@
     "REVISION" integer not null,
     "DELETED" integer not null,
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -344,7 +344,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -353,7 +353,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (
@@ -427,7 +427,7 @@
     "DELEGATOR" nvarchar2(255),
     "DELEGATE" nvarchar2(255),
     "READ_WRITE" integer not null, 
-    primary key("DELEGATOR", "READ_WRITE", "DELEGATE")
+    primary key ("DELEGATOR", "READ_WRITE", "DELEGATE")
 );
 
 create table DELEGATE_GROUPS (
@@ -435,7 +435,7 @@
     "GROUP_ID" integer not null,
     "READ_WRITE" integer not null,
     "IS_EXTERNAL" integer not null, 
-    primary key("DELEGATOR", "READ_WRITE", "GROUP_ID")
+    primary key ("DELEGATOR", "READ_WRITE", "GROUP_ID")
 );
 
 create table EXTERNAL_DELEGATE_GROUPS (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v38.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v38.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v38.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -9,7 +9,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -81,7 +81,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -99,8 +99,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -150,7 +150,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -216,8 +216,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -225,7 +225,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -252,8 +252,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -266,8 +266,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -286,14 +286,14 @@
     "REVISION" integer not null,
     "REMOVED" integer default 0 not null,
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("GROUP_ID", "MEMBER_ID", "REVISION")
+    primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -305,8 +305,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -336,7 +336,7 @@
     "REVISION" integer not null,
     "DELETED" integer not null,
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -346,7 +346,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -355,7 +355,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (
@@ -429,7 +429,7 @@
     "DELEGATOR" nvarchar2(255),
     "DELEGATE" nvarchar2(255),
     "READ_WRITE" integer not null, 
-    primary key("DELEGATOR", "READ_WRITE", "DELEGATE")
+    primary key ("DELEGATOR", "READ_WRITE", "DELEGATE")
 );
 
 create table DELEGATE_GROUPS (
@@ -437,7 +437,7 @@
     "GROUP_ID" integer not null,
     "READ_WRITE" integer not null,
     "IS_EXTERNAL" integer not null, 
-    primary key("DELEGATOR", "READ_WRITE", "GROUP_ID")
+    primary key ("DELEGATOR", "READ_WRITE", "GROUP_ID")
 );
 
 create table EXTERNAL_DELEGATE_GROUPS (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v39.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v39.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v39.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -9,7 +9,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null, 
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 create table NAMED_LOCK (
@@ -81,7 +81,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -99,8 +99,8 @@
     "ALARM_VTODO_TIMED" nclob default null,
     "ALARM_VTODO_ALLDAY" nclob default null,
     "TIMEZONE" nclob default null, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -150,7 +150,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -216,8 +216,8 @@
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
     "MANAGED_ID" nvarchar2(255),
     "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade, 
-    primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
-    unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
+    primary key ("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"), 
+    unique ("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
 );
 
 create table RESOURCE_PROPERTY (
@@ -225,7 +225,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -252,8 +252,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -266,8 +266,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
 );
 
 create table ADDRESSBOOK_OBJECT_KIND (
@@ -286,14 +286,14 @@
     "REVISION" integer not null,
     "REMOVED" integer default 0 not null,
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("GROUP_ID", "MEMBER_ID", "REVISION")
+    primary key ("GROUP_ID", "MEMBER_ID", "REVISION")
 );
 
 create table ABO_FOREIGN_MEMBERS (
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 create table SHARED_GROUP_BIND (
@@ -305,8 +305,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -336,7 +336,7 @@
     "REVISION" integer not null,
     "DELETED" integer not null,
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -346,7 +346,7 @@
     "SUBSCRIBER_GUID" nvarchar2(255),
     "USER_AGENT" nvarchar2(255) default null,
     "IP_ADDR" nvarchar2(255) default null, 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table IMIP_TOKENS (
@@ -355,7 +355,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create table IMIP_INVITATION_WORK (
@@ -429,7 +429,7 @@
     "DELEGATOR" nvarchar2(255),
     "DELEGATE" nvarchar2(255),
     "READ_WRITE" integer not null, 
-    primary key("DELEGATOR", "READ_WRITE", "DELEGATE")
+    primary key ("DELEGATOR", "READ_WRITE", "DELEGATE")
 );
 
 create table DELEGATE_GROUPS (
@@ -437,7 +437,7 @@
     "GROUP_ID" integer not null references GROUPS on delete cascade,
     "READ_WRITE" integer not null,
     "IS_EXTERNAL" integer not null, 
-    primary key("DELEGATOR", "READ_WRITE", "GROUP_ID")
+    primary key ("DELEGATOR", "READ_WRITE", "GROUP_ID")
 );
 
 create table EXTERNAL_DELEGATE_GROUPS (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v4.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v4.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v4.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -39,7 +39,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -51,8 +51,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -93,7 +93,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -150,7 +150,7 @@
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "PATH" nvarchar2(1024), 
-    unique("DROPBOX_ID", "PATH")
+    unique ("DROPBOX_ID", "PATH")
 );
 
 create table RESOURCE_PROPERTY (
@@ -158,7 +158,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -186,8 +186,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -199,8 +199,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -210,7 +210,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT_REVISIONS (
@@ -220,7 +220,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table NOTIFICATION_OBJECT_REVISIONS (
@@ -228,7 +228,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDARSERVER (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v5.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v5.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v5.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -39,7 +39,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -51,8 +51,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -93,7 +93,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -150,7 +150,7 @@
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "PATH" nvarchar2(1024), 
-    primary key("DROPBOX_ID", "PATH")
+    primary key ("DROPBOX_ID", "PATH")
 );
 
 create table RESOURCE_PROPERTY (
@@ -158,7 +158,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -186,8 +186,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -199,8 +199,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -226,7 +226,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDARSERVER (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v6.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v6.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v6.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -39,7 +39,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -51,8 +51,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -93,7 +93,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -150,7 +150,7 @@
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "PATH" nvarchar2(1024), 
-    primary key("DROPBOX_ID", "PATH")
+    primary key ("DROPBOX_ID", "PATH")
 );
 
 create table RESOURCE_PROPERTY (
@@ -158,7 +158,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -186,8 +186,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -199,8 +199,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -226,7 +226,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -234,7 +234,7 @@
     "RESOURCE_KEY" nvarchar2(255),
     "MODIFIED" integer not null,
     "SUBSCRIBER_GUID" nvarchar2(255), 
-    unique("TOKEN", "RESOURCE_KEY")
+    unique ("TOKEN", "RESOURCE_KEY")
 );
 
 create table CALENDARSERVER (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v7.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v7.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v7.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -43,7 +43,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -55,8 +55,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -97,7 +97,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -154,7 +154,7 @@
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "PATH" nvarchar2(1024), 
-    primary key("DROPBOX_ID", "PATH")
+    primary key ("DROPBOX_ID", "PATH")
 );
 
 create table RESOURCE_PROPERTY (
@@ -162,7 +162,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -193,8 +193,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -206,8 +206,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -233,7 +233,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -241,7 +241,7 @@
     "RESOURCE_KEY" nvarchar2(255),
     "MODIFIED" integer not null,
     "SUBSCRIBER_GUID" nvarchar2(255), 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table CALENDARSERVER (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v8.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v8.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v8.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -47,7 +47,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -59,8 +59,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -101,7 +101,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -158,7 +158,7 @@
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "PATH" nvarchar2(1024), 
-    primary key("DROPBOX_ID", "PATH")
+    primary key ("DROPBOX_ID", "PATH")
 );
 
 create table RESOURCE_PROPERTY (
@@ -166,7 +166,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -201,8 +201,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -214,8 +214,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -241,7 +241,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -249,7 +249,7 @@
     "RESOURCE_KEY" nvarchar2(255),
     "MODIFIED" integer not null,
     "SUBSCRIBER_GUID" nvarchar2(255), 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table CALENDARSERVER (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v9.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v9.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v9.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -47,7 +47,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
+    unique ("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
 );
 
 create table CALENDAR_BIND (
@@ -59,8 +59,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
-    unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
+    primary key ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"), 
+    unique ("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
 );
 
 create table CALENDAR_BIND_MODE (
@@ -101,7 +101,7 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table CALENDAR_OBJECT_ATTACHMENTS_MO (
@@ -158,7 +158,7 @@
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "PATH" nvarchar2(1024), 
-    primary key("DROPBOX_ID", "PATH")
+    primary key ("DROPBOX_ID", "PATH")
 );
 
 create table RESOURCE_PROPERTY (
@@ -166,7 +166,7 @@
     "NAME" nvarchar2(255),
     "VALUE" nclob,
     "VIEWER_UID" nvarchar2(255), 
-    primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
+    primary key ("RESOURCE_ID", "NAME", "VIEWER_UID")
 );
 
 create table ADDRESSBOOK_HOME (
@@ -201,8 +201,8 @@
     "SEEN_BY_OWNER" integer not null,
     "SEEN_BY_SHAREE" integer not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create table ADDRESSBOOK_OBJECT (
@@ -214,8 +214,8 @@
     "MD5" nchar(32),
     "CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
     "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC', 
-    unique("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
-    unique("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
+    unique ("ADDRESSBOOK_RESOURCE_ID", "RESOURCE_NAME"), 
+    unique ("ADDRESSBOOK_RESOURCE_ID", "VCARD_UID")
 );
 
 create table CALENDAR_OBJECT_REVISIONS (
@@ -241,7 +241,7 @@
     "RESOURCE_NAME" nvarchar2(255),
     "REVISION" integer not null,
     "DELETED" integer not null, 
-    unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
+    unique ("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
 );
 
 create table APN_SUBSCRIPTIONS (
@@ -249,7 +249,7 @@
     "RESOURCE_KEY" nvarchar2(255),
     "MODIFIED" integer not null,
     "SUBSCRIBER_GUID" nvarchar2(255), 
-    primary key("TOKEN", "RESOURCE_KEY")
+    primary key ("TOKEN", "RESOURCE_KEY")
 );
 
 create table CALENDARSERVER (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v10.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v10.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v10.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -102,7 +102,7 @@
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -128,8 +128,8 @@
   SEEN_BY_SHAREE            boolean      not null,
   MESSAGE                   text,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -185,13 +185,13 @@
   CREATED              timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED             timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  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)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -300,7 +300,7 @@
   MODIFIED                    timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   PATH                        varchar(1024) not null,
 
-  primary key(DROPBOX_ID, PATH) --implicit index
+  primary key (DROPBOX_ID, PATH) --implicit index
 );
 
 create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
@@ -316,7 +316,7 @@
   VALUE       text         not null, -- FIXME: xml?
   VIEWER_UID  varchar(255),
 
-  primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
+  primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
 );
 
 
@@ -381,8 +381,8 @@
   SEEN_BY_SHAREE               boolean      not null,
   MESSAGE                      text,                  -- FIXME: xml?
 
-  primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
+  primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
 );
 
 create index ADDRESSBOOK_BIND_RESOURCE_ID on
@@ -398,8 +398,8 @@
   CREATED                 timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
-  unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID)      -- implicit index
+  unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+  unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID)      -- implicit index
 );
 
 ---------------
@@ -463,7 +463,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
@@ -479,7 +479,7 @@
   MODIFIED                      integer not null,
   SUBSCRIBER_GUID               varchar(255) not null,
 
-  primary key(TOKEN, RESOURCE_KEY) -- implicit index
+  primary key (TOKEN, RESOURCE_KEY) -- implicit index
 );
 
 create index APN_SUBSCRIPTIONS_RESOURCE_KEY

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v11.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v11.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v11.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -102,7 +102,7 @@
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -128,8 +128,8 @@
   SEEN_BY_SHAREE            boolean      not null,
   MESSAGE                   text,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -185,13 +185,13 @@
   CREATED              timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED             timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  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)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -300,7 +300,7 @@
   MODIFIED                    timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   PATH                        varchar(1024) not null,
 
-  primary key(DROPBOX_ID, PATH) --implicit index
+  primary key (DROPBOX_ID, PATH) --implicit index
 );
 
 create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
@@ -316,7 +316,7 @@
   VALUE       text         not null, -- FIXME: xml?
   VIEWER_UID  varchar(255),
 
-  primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
+  primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
 );
 
 
@@ -381,8 +381,8 @@
   SEEN_BY_SHAREE               boolean      not null,
   MESSAGE                      text,                  -- FIXME: xml?
 
-  primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
+  primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
 );
 
 create index ADDRESSBOOK_BIND_RESOURCE_ID on
@@ -398,8 +398,8 @@
   CREATED                 timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
-  unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID)      -- implicit index
+  unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+  unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID)      -- implicit index
 );
 
 ---------------
@@ -463,7 +463,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
@@ -481,7 +481,7 @@
   USER_AGENT                    varchar(255) default null,
   IP_ADDR                       varchar(255) default null,
 
-  primary key(TOKEN, RESOURCE_KEY) -- implicit index
+  primary key (TOKEN, RESOURCE_KEY) -- implicit index
 );
 
 create index APN_SUBSCRIPTIONS_RESOURCE_KEY

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v12.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v12.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v12.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -35,7 +35,7 @@
   PORT      integer not null,
   TIME      timestamp not null default timezone('UTC', CURRENT_TIMESTAMP),
 
-  primary key(HOSTNAME, PORT)
+  primary key (HOSTNAME, PORT)
 );
 
 
@@ -118,7 +118,7 @@
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -144,8 +144,8 @@
   SEEN_BY_SHAREE            boolean      not null,
   MESSAGE                   text,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -201,13 +201,13 @@
   CREATED              timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED             timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  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)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -316,7 +316,7 @@
   MODIFIED                    timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   PATH                        varchar(1024) not null,
 
-  primary key(DROPBOX_ID, PATH) --implicit index
+  primary key (DROPBOX_ID, PATH) --implicit index
 );
 
 create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
@@ -332,7 +332,7 @@
   VALUE       text         not null, -- FIXME: xml?
   VIEWER_UID  varchar(255),
 
-  primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
+  primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
 );
 
 
@@ -397,8 +397,8 @@
   SEEN_BY_SHAREE               boolean      not null,
   MESSAGE                      text,                  -- FIXME: xml?
 
-  primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
+  primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
 );
 
 create index ADDRESSBOOK_BIND_RESOURCE_ID on
@@ -414,8 +414,8 @@
   CREATED                 timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
-  unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID)      -- implicit index
+  unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+  unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID)      -- implicit index
 );
 
 ---------------
@@ -479,7 +479,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
@@ -497,7 +497,7 @@
   USER_AGENT                    varchar(255) default null,
   IP_ADDR                       varchar(255) default null,
 
-  primary key(TOKEN, RESOURCE_KEY) -- implicit index
+  primary key (TOKEN, RESOURCE_KEY) -- implicit index
 );
 
 create index APN_SUBSCRIPTIONS_RESOURCE_KEY

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v13.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v13.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v13.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -118,7 +118,7 @@
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -144,8 +144,8 @@
   SEEN_BY_SHAREE            boolean      not null,
   MESSAGE                   text,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -207,7 +207,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -492,7 +492,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v14.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v14.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v14.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -100,7 +100,7 @@
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -120,8 +120,8 @@
   BIND_STATUS               integer      not null, -- enum CALENDAR_BIND_STATUS
   MESSAGE                   text,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -183,7 +183,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -462,7 +462,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v15.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v15.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v15.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -106,7 +106,7 @@
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -126,8 +126,8 @@
   BIND_STATUS               integer      not null, -- enum CALENDAR_BIND_STATUS
   MESSAGE                   text,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -189,7 +189,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -468,7 +468,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v16.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v16.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v16.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -106,7 +106,7 @@
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -126,8 +126,8 @@
   BIND_STATUS               integer      not null, -- enum CALENDAR_BIND_STATUS
   MESSAGE                   text,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -189,7 +189,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -468,7 +468,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v17.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v17.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v17.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -106,7 +106,7 @@
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -126,8 +126,8 @@
   BIND_STATUS               integer      not null, -- enum CALENDAR_BIND_STATUS
   MESSAGE                   text,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -188,7 +188,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -467,7 +467,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v18.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v18.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v18.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -106,7 +106,7 @@
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -126,8 +126,8 @@
   BIND_STATUS               integer      not null, -- enum CALENDAR_BIND_STATUS
   MESSAGE                   text,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -188,7 +188,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -467,7 +467,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v19.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v19.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v19.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -112,7 +112,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -138,8 +138,8 @@
   ALARM_VTODO_TIMED         text         default null,
   ALARM_VTODO_ALLDAY        text         default null,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -211,7 +211,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -491,7 +491,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v20.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v20.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v20.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -114,7 +114,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -141,8 +141,8 @@
   ALARM_VTODO_TIMED         text         default null,
   ALARM_VTODO_ALLDAY        text         default null,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -214,7 +214,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -544,7 +544,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v21.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v21.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v21.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -114,7 +114,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -141,8 +141,8 @@
   ALARM_VTODO_TIMED         text         default null,
   ALARM_VTODO_ALLDAY        text         default null,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -214,7 +214,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -544,7 +544,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v22.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v22.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v22.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -115,7 +115,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -143,8 +143,8 @@
   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
+  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);
@@ -216,7 +216,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -546,7 +546,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v23.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v23.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v23.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -115,7 +115,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -143,8 +143,8 @@
   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
+  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);
@@ -216,7 +216,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -551,7 +551,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v24.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v24.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v24.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -119,7 +119,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -147,8 +147,8 @@
   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
+  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
@@ -221,7 +221,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -566,7 +566,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v25.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v25.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v25.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -119,7 +119,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -147,8 +147,8 @@
   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
+  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
@@ -221,7 +221,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -566,7 +566,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v26.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v26.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v26.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -119,7 +119,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -147,8 +147,8 @@
   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
+  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
@@ -221,7 +221,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -566,7 +566,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v27.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v27.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v27.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -119,7 +119,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -147,8 +147,8 @@
   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
+  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
@@ -221,7 +221,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -569,7 +569,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v28.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v28.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v28.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -119,7 +119,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -147,8 +147,8 @@
   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
+  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
@@ -221,7 +221,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -569,7 +569,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v29.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v29.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v29.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -122,7 +122,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -150,8 +150,8 @@
   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
+  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
@@ -224,7 +224,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -572,7 +572,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v3.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v3.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v3.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -95,7 +95,7 @@
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID)
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID)
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -123,8 +123,8 @@
   SEEN_BY_SHAREE            boolean      not null,
   MESSAGE                   text,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID),
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)
+  primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID),
+  unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)
 );
 
 create index CALENDAR_BIND_HOME_RESOURCE_ID on
@@ -182,13 +182,13 @@
   CREATED              timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED             timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME)
+  unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME)
 
   -- 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)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID on
@@ -300,7 +300,7 @@
   MODIFIED                    timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   PATH                        varchar(1024) not null,
 
-  unique(DROPBOX_ID, PATH)
+  unique (DROPBOX_ID, PATH)
 );
 
 create index ATTACHMENT_DROPBOX_ID on ATTACHMENT(DROPBOX_ID);
@@ -316,7 +316,7 @@
   VALUE       text         not null, -- FIXME: xml?
   VIEWER_UID  varchar(255),
 
-  primary key(RESOURCE_ID, NAME, VIEWER_UID)
+  primary key (RESOURCE_ID, NAME, VIEWER_UID)
 );
 
 
@@ -374,8 +374,8 @@
   SEEN_BY_SHAREE               boolean      not null,
   MESSAGE                      text,                  -- FIXME: xml?
 
-  primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID),
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)
+  primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID),
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)
 );
 
 create index ADDRESSBOOK_BIND_HOME_RESOURCE_ID on
@@ -393,8 +393,8 @@
   CREATED                 timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME),
-  unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID)
+  unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME),
+  unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID)
 );
 
 create index ADDRESSBOOK_OBJECT_ADDRESSBOOK_RESOURCE_ID on
@@ -419,7 +419,7 @@
   REVISION                  integer      default nextval('REVISION_SEQ') not null,
   DELETED                   boolean      not null,
 
-  unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME)
+  unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME)
 );
 
 
@@ -442,7 +442,7 @@
   REVISION                     integer      default nextval('REVISION_SEQ') not null,
   DELETED                      boolean      not null,
 
-  unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME)
+  unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME)
 );
 
 create index ADDRESSBOOK_OBJECT_REVISIONS_HOME_RESOURCE_ID
@@ -461,7 +461,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME)
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME)
 );
 
 
@@ -476,7 +476,7 @@
 create table CALENDARSERVER (
   NAME                          varchar(255),
   VALUE                         varchar(255),
-  unique(NAME)
+  unique (NAME)
 );
 
 insert into CALENDARSERVER values ('VERSION', '3');

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v30.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v30.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v30.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -123,7 +123,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -151,8 +151,8 @@
   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
+  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
@@ -227,7 +227,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -575,7 +575,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v31.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v31.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v31.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -123,7 +123,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -151,8 +151,8 @@
   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
+  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
@@ -227,7 +227,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -584,7 +584,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v32.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v32.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v32.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -138,7 +138,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -167,8 +167,8 @@
   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
+  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
@@ -243,7 +243,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -603,7 +603,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v33.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v33.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v33.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -138,7 +138,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -167,8 +167,8 @@
   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
+  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
@@ -243,7 +243,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -607,7 +607,7 @@
   DELETED                       boolean      not null,
   MODIFIED                  	timestamp	 default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v34.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v34.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v34.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -138,7 +138,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -167,8 +167,8 @@
   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
+  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
@@ -243,7 +243,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -607,7 +607,7 @@
   DELETED                       boolean      not null,
   MODIFIED                  	timestamp	 default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -138,7 +138,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -167,8 +167,8 @@
   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
+  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
@@ -243,7 +243,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -607,7 +607,7 @@
   DELETED                       boolean      not null,
   MODIFIED                  	timestamp	 default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -138,7 +138,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -167,8 +167,8 @@
   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
+  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
@@ -243,7 +243,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -607,7 +607,7 @@
   DELETED                       boolean      not null,
   MODIFIED                  	timestamp	 default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v37.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v37.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v37.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -162,7 +162,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -191,8 +191,8 @@
   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
+  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
@@ -267,7 +267,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -631,7 +631,7 @@
   DELETED                       boolean      not null,
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v38.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v38.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v38.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -162,7 +162,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -191,8 +191,8 @@
   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
+  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
@@ -267,7 +267,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -633,7 +633,7 @@
   DELETED                       boolean      not null,
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v39.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v39.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v39.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -162,7 +162,7 @@
   CREATED                       timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -191,8 +191,8 @@
   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
+  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
@@ -267,7 +267,7 @@
   -- calendar objects, this constraint has to be selectively enforced by the
   -- application layer.
 
-  -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -633,7 +633,7 @@
   DELETED                       boolean      not null,
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v4.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v4.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v4.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -95,7 +95,7 @@
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID)
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID)
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -123,8 +123,8 @@
   SEEN_BY_SHAREE            boolean      not null,
   MESSAGE                   text,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID),
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)
+  primary key (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID),
+  unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)
 );
 
 create index CALENDAR_BIND_HOME_RESOURCE_ID on
@@ -182,13 +182,13 @@
   CREATED              timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED             timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME)
+  unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME)
 
   -- 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)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID on
@@ -300,7 +300,7 @@
   MODIFIED                    timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   PATH                        varchar(1024) not null,
 
-  unique(DROPBOX_ID, PATH)
+  unique (DROPBOX_ID, PATH)
 );
 
 create index ATTACHMENT_DROPBOX_ID on ATTACHMENT(DROPBOX_ID);
@@ -316,7 +316,7 @@
   VALUE       text         not null, -- FIXME: xml?
   VIEWER_UID  varchar(255),
 
-  primary key(RESOURCE_ID, NAME, VIEWER_UID)
+  primary key (RESOURCE_ID, NAME, VIEWER_UID)
 );
 
 
@@ -374,8 +374,8 @@
   SEEN_BY_SHAREE               boolean      not null,
   MESSAGE                      text,                  -- FIXME: xml?
 
-  primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID),
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)
+  primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID),
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)
 );
 
 create index ADDRESSBOOK_BIND_HOME_RESOURCE_ID on
@@ -393,8 +393,8 @@
   CREATED                 timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME),
-  unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID)
+  unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME),
+  unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID)
 );
 
 create index ADDRESSBOOK_OBJECT_ADDRESSBOOK_RESOURCE_ID on
@@ -419,7 +419,7 @@
   REVISION                  integer      default nextval('REVISION_SEQ') not null,
   DELETED                   boolean      not null,
 
-  unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME)
+  unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME)
 );
 
 
@@ -442,7 +442,7 @@
   REVISION                     integer      default nextval('REVISION_SEQ') not null,
   DELETED                      boolean      not null,
 
-  unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME)
+  unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME)
 );
 
 create index ADDRESSBOOK_OBJECT_REVISIONS_HOME_RESOURCE_ID
@@ -461,7 +461,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME)
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME)
 );
 
 
@@ -476,7 +476,7 @@
 create table CALENDARSERVER (
   NAME                          varchar(255),
   VALUE                         varchar(255),
-  unique(NAME)
+  unique (NAME)
 );
 
 insert into CALENDARSERVER values ('VERSION', '4');

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v48.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v48.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v48.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -584,7 +584,7 @@
   DELETED                   boolean      not null,
   MODIFIED                  timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
+  unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
@@ -608,7 +608,7 @@
   DELETED                       boolean      not null,
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v49.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v49.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v49.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -584,7 +584,7 @@
   DELETED                   boolean      not null,
   MODIFIED                  timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
+  unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
@@ -611,7 +611,7 @@
   DELETED                       boolean      not null,
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v5.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v5.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v5.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -89,7 +89,7 @@
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -115,8 +115,8 @@
   SEEN_BY_SHAREE            boolean      not null,
   MESSAGE                   text,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -171,13 +171,13 @@
   CREATED              timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED             timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  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)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -286,7 +286,7 @@
   MODIFIED                    timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   PATH                        varchar(1024) not null,
 
-  primary key(DROPBOX_ID, PATH) --implicit index
+  primary key (DROPBOX_ID, PATH) --implicit index
 );
 
 create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
@@ -302,7 +302,7 @@
   VALUE       text         not null, -- FIXME: xml?
   VIEWER_UID  varchar(255),
 
-  primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
+  primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
 );
 
 
@@ -355,8 +355,8 @@
   SEEN_BY_SHAREE               boolean      not null,
   MESSAGE                      text,                  -- FIXME: xml?
 
-  primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
+  primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
 );
 
 create index ADDRESSBOOK_BIND_RESOURCE_ID on
@@ -372,8 +372,8 @@
   CREATED                 timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
-  unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID)      -- implicit index
+  unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+  unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID)      -- implicit index
 );
 
 ---------------
@@ -431,7 +431,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v50.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v50.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v50.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -584,7 +584,7 @@
   DELETED                   boolean      not null,
   MODIFIED                  timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
+  unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
@@ -611,7 +611,7 @@
   DELETED                       boolean      not null,
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v51.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v51.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v51.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -584,7 +584,7 @@
   DELETED                   boolean      not null,
   MODIFIED                  timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
+  unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
@@ -611,7 +611,7 @@
   DELETED                       boolean      not null,
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v52.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v52.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v52.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -584,7 +584,7 @@
   DELETED                   boolean      not null,
   MODIFIED                  timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
+  unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
@@ -611,7 +611,7 @@
   DELETED                       boolean      not null,
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v53.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v53.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v53.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -645,7 +645,7 @@
   DELETED                   boolean      not null,
   MODIFIED                  timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
+  unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
@@ -672,7 +672,7 @@
   DELETED                       boolean      not null,
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v54.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v54.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v54.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -666,7 +666,7 @@
   DELETED                   boolean      not null,
   MODIFIED                  timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
+  unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
@@ -693,7 +693,7 @@
   DELETED                       boolean      not null,
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v55.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v55.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v55.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -667,7 +667,7 @@
   DELETED                   boolean      not null,
   MODIFIED                  timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
+  unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
@@ -694,7 +694,7 @@
   DELETED                       boolean      not null,
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v56.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v56.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v56.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -667,7 +667,7 @@
   DELETED                   boolean      not null,
   MODIFIED                  timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
+  unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
@@ -694,7 +694,7 @@
   DELETED                       boolean      not null,
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v57.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v57.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v57.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -667,7 +667,7 @@
   DELETED                   boolean      not null,
   MODIFIED                  timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
+  unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
@@ -694,7 +694,7 @@
   DELETED                       boolean      not null,
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v58.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v58.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v58.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -651,7 +651,7 @@
   DELETED                   boolean      not null,
   MODIFIED                  timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
+  unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION
@@ -678,7 +678,7 @@
   DELETED                       boolean      not null,
   MODIFIED                      timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME)    -- implicit index
 );
 
 create index ADDRESSBOOK_OBJECT_REVISIONS_OWNER_HOME_RESOURCE_ID_RESOURCE_NAME_DELETED_REVISION

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v6.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v6.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v6.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -89,7 +89,7 @@
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -115,8 +115,8 @@
   SEEN_BY_SHAREE            boolean      not null,
   MESSAGE                   text,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -171,13 +171,13 @@
   CREATED              timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED             timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  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)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -286,7 +286,7 @@
   MODIFIED                    timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   PATH                        varchar(1024) not null,
 
-  primary key(DROPBOX_ID, PATH) --implicit index
+  primary key (DROPBOX_ID, PATH) --implicit index
 );
 
 create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
@@ -302,7 +302,7 @@
   VALUE       text         not null, -- FIXME: xml?
   VIEWER_UID  varchar(255),
 
-  primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
+  primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
 );
 
 
@@ -355,8 +355,8 @@
   SEEN_BY_SHAREE               boolean      not null,
   MESSAGE                      text,                  -- FIXME: xml?
 
-  primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
+  primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
 );
 
 create index ADDRESSBOOK_BIND_RESOURCE_ID on
@@ -372,8 +372,8 @@
   CREATED                 timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
-  unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID)      -- implicit index
+  unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+  unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID)      -- implicit index
 );
 
 ---------------
@@ -431,7 +431,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 
@@ -444,7 +444,7 @@
   RESOURCE_KEY                  varchar(255) not null,
   MODIFIED                      integer not null,
   SUBSCRIBER_GUID               varchar(255) not null,
-  unique(TOKEN, RESOURCE_KEY) -- implicit index
+  unique (TOKEN, RESOURCE_KEY) -- implicit index
 );
 
 create index APN_SUBSCRIPTIONS_RESOURCE_KEY

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v7.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v7.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v7.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -93,7 +93,7 @@
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -119,8 +119,8 @@
   SEEN_BY_SHAREE            boolean      not null,
   MESSAGE                   text,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -175,13 +175,13 @@
   CREATED              timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED             timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  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)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -290,7 +290,7 @@
   MODIFIED                    timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   PATH                        varchar(1024) not null,
 
-  primary key(DROPBOX_ID, PATH) --implicit index
+  primary key (DROPBOX_ID, PATH) --implicit index
 );
 
 create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
@@ -306,7 +306,7 @@
   VALUE       text         not null, -- FIXME: xml?
   VIEWER_UID  varchar(255),
 
-  primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
+  primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
 );
 
 
@@ -362,8 +362,8 @@
   SEEN_BY_SHAREE               boolean      not null,
   MESSAGE                      text,                  -- FIXME: xml?
 
-  primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
+  primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
 );
 
 create index ADDRESSBOOK_BIND_RESOURCE_ID on
@@ -379,8 +379,8 @@
   CREATED                 timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
-  unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID)      -- implicit index
+  unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+  unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID)      -- implicit index
 );
 
 ---------------
@@ -444,7 +444,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
@@ -460,7 +460,7 @@
   MODIFIED                      integer not null,
   SUBSCRIBER_GUID               varchar(255) not null,
 
-  primary key(TOKEN, RESOURCE_KEY) -- implicit index
+  primary key (TOKEN, RESOURCE_KEY) -- implicit index
 );
 
 create index APN_SUBSCRIPTIONS_RESOURCE_KEY

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v8.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v8.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v8.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -102,7 +102,7 @@
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -128,8 +128,8 @@
   SEEN_BY_SHAREE            boolean      not null,
   MESSAGE                   text,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -184,13 +184,13 @@
   CREATED              timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED             timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  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)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -299,7 +299,7 @@
   MODIFIED                    timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   PATH                        varchar(1024) not null,
 
-  primary key(DROPBOX_ID, PATH) --implicit index
+  primary key (DROPBOX_ID, PATH) --implicit index
 );
 
 create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
@@ -315,7 +315,7 @@
   VALUE       text         not null, -- FIXME: xml?
   VIEWER_UID  varchar(255),
 
-  primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
+  primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
 );
 
 
@@ -380,8 +380,8 @@
   SEEN_BY_SHAREE               boolean      not null,
   MESSAGE                      text,                  -- FIXME: xml?
 
-  primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
+  primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
 );
 
 create index ADDRESSBOOK_BIND_RESOURCE_ID on
@@ -397,8 +397,8 @@
   CREATED                 timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
-  unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID)      -- implicit index
+  unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+  unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID)      -- implicit index
 );
 
 ---------------
@@ -462,7 +462,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
@@ -478,7 +478,7 @@
   MODIFIED                      integer not null,
   SUBSCRIBER_GUID               varchar(255) not null,
 
-  primary key(TOKEN, RESOURCE_KEY) -- implicit index
+  primary key (TOKEN, RESOURCE_KEY) -- implicit index
 );
 
 create index APN_SUBSCRIPTIONS_RESOURCE_KEY

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v9.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v9.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v9.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -102,7 +102,7 @@
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
+  unique (NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
 );
 
 create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
@@ -128,8 +128,8 @@
   SEEN_BY_SHAREE            boolean      not null,
   MESSAGE                   text,
 
-  primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
-  unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)     -- implicit index
+  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);
@@ -184,13 +184,13 @@
   CREATED              timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED             timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  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)
+  -- unique (CALENDAR_RESOURCE_ID, ICALENDAR_UID)
 );
 
 create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
@@ -299,7 +299,7 @@
   MODIFIED                    timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   PATH                        varchar(1024) not null,
 
-  primary key(DROPBOX_ID, PATH) --implicit index
+  primary key (DROPBOX_ID, PATH) --implicit index
 );
 
 create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
@@ -315,7 +315,7 @@
   VALUE       text         not null, -- FIXME: xml?
   VIEWER_UID  varchar(255),
 
-  primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
+  primary key (RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
 );
 
 
@@ -380,8 +380,8 @@
   SEEN_BY_SHAREE               boolean      not null,
   MESSAGE                      text,                  -- FIXME: xml?
 
-  primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
-  unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
+  primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+  unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)     -- implicit index
 );
 
 create index ADDRESSBOOK_BIND_RESOURCE_ID on
@@ -397,8 +397,8 @@
   CREATED                 timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                timestamp    default timezone('UTC', CURRENT_TIMESTAMP),
 
-  unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
-  unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID)      -- implicit index
+  unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+  unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID)      -- implicit index
 );
 
 ---------------
@@ -462,7 +462,7 @@
   REVISION                      integer      default nextval('REVISION_SEQ') not null,
   DELETED                       boolean      not null,
 
-  unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
+  unique (NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
 );
 
 create index NOTIFICATION_OBJECT_REVISIONS_RESOURCE_ID_REVISION
@@ -478,7 +478,7 @@
   MODIFIED                      integer not null,
   SUBSCRIBER_GUID               varchar(255) not null,
 
-  primary key(TOKEN, RESOURCE_KEY) -- implicit index
+  primary key (TOKEN, RESOURCE_KEY) -- implicit index
 );
 
 create index APN_SUBSCRIPTIONS_RESOURCE_KEY

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_11_to_12.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_11_to_12.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_11_to_12.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -23,7 +23,7 @@
     "PID" integer not null,
     "PORT" integer not null,
     "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
-    primary key("HOSTNAME", "PORT")
+    primary key ("HOSTNAME", "PORT")
 );
 
 -- Now update the version

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_12_to_13.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_12_to_13.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_12_to_13.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -39,7 +39,7 @@
 
 -- now set ATTACHMENT_ID as primary key, which implies unique and not null
 alter table ATTACHMENT
- add primary key(ATTACHMENT_ID);
+ add primary key (ATTACHMENT_ID);
 
 create table ATTACHMENT_CALENDAR_OBJECT (
     "ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_15_to_16.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_15_to_16.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_15_to_16.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -27,7 +27,7 @@
     "ATTENDEE" nvarchar2(255),
     "ICALUID" nvarchar2(255),
     "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
-    primary key("ORGANIZER", "ATTENDEE", "ICALUID")
+    primary key ("ORGANIZER", "ATTENDEE", "ICALUID")
 );
 
 create index IMIP_TOKENS_TOKEN_e94b918f on IMIP_TOKENS (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_19_to_20.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_19_to_20.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_19_to_20.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -37,8 +37,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
 );
 
 create index SHARED_ADDRESSBOOK_BI_e9a2e6d4 on SHARED_ADDRESSBOOK_BIND (
@@ -60,8 +60,8 @@
     "BIND_STATUS" integer not null,
     "BIND_REVISION" integer default 0 not null,
     "MESSAGE" nclob, 
-    primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
-    unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
+    primary key ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"), 
+    unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
 );
 
 create index SHARED_GROUP_BIND_RES_cf52f95d on SHARED_GROUP_BIND (
@@ -92,7 +92,7 @@
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ID" integer not null references ADDRESSBOOK_OBJECT, 
-    primary key("GROUP_ID", "MEMBER_ID")
+    primary key ("GROUP_ID", "MEMBER_ID")
 );
 
 
@@ -104,7 +104,7 @@
     "GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
     "ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
     "MEMBER_ADDRESS" nvarchar2(255), 
-    primary key("GROUP_ID", "MEMBER_ADDRESS")
+    primary key ("GROUP_ID", "MEMBER_ADDRESS")
 );
 
 

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_34_to_35.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_34_to_35.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_34_to_35.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -56,7 +56,7 @@
     "DELEGATOR" nvarchar2(255),
     "DELEGATE" nvarchar2(255),
     "READ_WRITE" integer not null,
-    primary key("DELEGATOR", "READ_WRITE", "DELEGATE")
+    primary key ("DELEGATOR", "READ_WRITE", "DELEGATE")
 );
 
 create table DELEGATE_GROUPS (
@@ -64,7 +64,7 @@
     "GROUP_ID" integer not null,
     "READ_WRITE" integer not null,
     "IS_EXTERNAL" integer not null,
-    primary key("DELEGATOR", "READ_WRITE", "GROUP_ID")
+    primary key ("DELEGATOR", "READ_WRITE", "GROUP_ID")
 );
 
 create table EXTERNAL_DELEGATE_GROUPS (

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_47_to_48.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_47_to_48.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_47_to_48.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -26,11 +26,11 @@
 drop index PERUSER_TIME_RANGE_IN_5468a226;
 
 -- Add unique to CALENDAR_OBJECT_REVISIONS and remove old index
-alter table CALENDAR_OBJECT_REVISIONS add unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME);
+alter table CALENDAR_OBJECT_REVISIONS add unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME);
 drop index CALENDAR_OBJECT_REVIS_3a3956c4;
 
 -- Add unique to ADDRESSBOOK_OBJECT_REVISIONS and remove old index
-alter table ADDRESSBOOK_OBJECT_REVISIONS add unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME);
+alter table ADDRESSBOOK_OBJECT_REVISIONS add unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME);
 drop index ADDRESSBOOK_OBJECT_RE_2bfcf757;
 
 

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_4_to_5.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_4_to_5.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_4_to_5.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -24,7 +24,7 @@
 
 drop index CALENDAR_HOME_METADAT_35a84eec;
 alter table CALENDAR_HOME_METADATA
- add primary key(RESOURCE_ID);
+ add primary key (RESOURCE_ID);
 
 --invalid drop index INVITE_RESOURCE_ID_b36ddc23;
 create index INVITE_RESOURCE_ID_b36ddc23 on INVITE(RESOURCE_ID);
@@ -43,16 +43,16 @@
 drop index ATTACHMENT_DROPBOX_ID_5073cf23;
 
 alter table ATTACHMENT 
- drop unique(DROPBOX_ID, PATH);
+ drop unique (DROPBOX_ID, PATH);
 alter table ATTACHMENT
- add primary key(DROPBOX_ID, PATH);
+ add primary key (DROPBOX_ID, PATH);
 
  create index ATTACHMENT_CALENDAR_H_0078845c on
   ATTACHMENT(CALENDAR_HOME_RESOURCE_ID);
   
 drop index ADDRESSBOOK_HOME_META_cfe06701;
 alter table ADDRESSBOOK_HOME_METADATA
- add primary key(RESOURCE_ID);
+ add primary key (RESOURCE_ID);
 
 drop index ADDRESSBOOK_BIND_HOME_6a6dc8ce;
 
@@ -65,19 +65,19 @@
 drop index NOTIFICATION_OBJECT_R_47002cd8;
 
 alter table CALENDARSERVER
- drop unique(NAME);
+ drop unique (NAME);
 alter table CALENDARSERVER
- add primary key(NAME);
+ add primary key (NAME);
 
 alter table CALENDAR_OBJECT_REVISIONS 
- drop unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME);
+ drop unique (CALENDAR_RESOURCE_ID, RESOURCE_NAME);
 create index CALENDAR_OBJECT_REVIS_2643d556 on CALENDAR_OBJECT_REVISIONS (
     CALENDAR_RESOURCE_ID,
     RESOURCE_NAME
 );
 
 alter table ADDRESSBOOK_OBJECT_REVISIONS 
- drop unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME);
+ drop unique (ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME);
 create index ADDRESSBOOK_OBJECT_RE_9a848f39 on ADDRESSBOOK_OBJECT_REVISIONS (
     ADDRESSBOOK_RESOURCE_ID,
     RESOURCE_NAME

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_5_to_6.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_5_to_6.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_5_to_6.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -27,7 +27,7 @@
   "RESOURCE_KEY"                nvarchar2(255),
   "MODIFIED"                    integer not null,
   "SUBSCRIBER_GUID"             nvarchar2(255), 
-  unique(TOKEN, RESOURCE_KEY) -- implicit index
+  unique (TOKEN, RESOURCE_KEY) -- implicit index
 );
 
 create index APN_SUBSCRIPTIONS_RES_9610d78e

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_6_to_7.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_6_to_7.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_6_to_7.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -56,9 +56,9 @@
 
 -- Change a constraint
 alter table APN_SUBSCRIPTIONS
- drop unique(TOKEN, RESOURCE_KEY);
+ drop unique (TOKEN, RESOURCE_KEY);
 alter table APN_SUBSCRIPTIONS
- add primary key(TOKEN, RESOURCE_KEY);
+ add primary key (TOKEN, RESOURCE_KEY);
 
 -- Now update the version
 update CALENDARSERVER set VALUE = '7' where NAME = 'VERSION';

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_11_to_12.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_11_to_12.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_11_to_12.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -23,7 +23,7 @@
   PID       integer not null,
   PORT      integer not null,
   TIME      timestamp not null default timezone('UTC', CURRENT_TIMESTAMP),
-  primary key(HOSTNAME, PORT)
+  primary key (HOSTNAME, PORT)
 );
 
 -- Now update the version

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_30_to_31.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_30_to_31.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_30_to_31.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -28,7 +28,7 @@
 	add column	REVISION		integer      default nextval('REVISION_SEQ') not null,
 	add column	REMOVED         boolean      default false not null,
 	drop constraint abo_members_pkey,
-	add constraint abo_members_pkey primary key(GROUP_ID, MEMBER_ID, REVISION);
+	add constraint abo_members_pkey primary key (GROUP_ID, MEMBER_ID, REVISION);
 
 ------------------------------------------
 -- Change Address Book Object Revisions --

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_39_to_40.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_39_to_40.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_39_to_40.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -37,7 +37,7 @@
 
 drop index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE;
 alter table SCHEDULE_REFRESH_ATTENDEES add
-  primary key(RESOURCE_ID, ATTENDEE);
+  primary key (RESOURCE_ID, ATTENDEE);
 
 -- update the version
 update CALENDARSERVER set VALUE = '40' where NAME = 'VERSION';

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_47_to_48.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_47_to_48.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_47_to_48.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -26,11 +26,11 @@
 drop index PERUSER_TIME_RANGE_INSTANCE_ID;
 
 -- Add unique to CALENDAR_OBJECT_REVISIONS and remove old index
-alter table CALENDAR_OBJECT_REVISIONS add unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME);
+alter table CALENDAR_OBJECT_REVISIONS add unique (CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID, CALENDAR_NAME, RESOURCE_NAME);
 drop index CALENDAR_OBJECT_REVISIONS_HOME_RESOURCE_ID_CALENDAR_RESOURCE_ID;
 
 -- Add unique to ADDRESSBOOK_OBJECT_REVISIONS and remove old index
-alter table ADDRESSBOOK_OBJECT_REVISIONS add unique(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME);
+alter table ADDRESSBOOK_OBJECT_REVISIONS add unique (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID, ADDRESSBOOK_NAME, RESOURCE_NAME);
 drop index ADDRESSBOOK_OBJECT_REVISIONS_HOME_RESOURCE_ID_OWNER_HOME_RESOURCE_ID;
 
 

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_4_to_5.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_4_to_5.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_4_to_5.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -24,7 +24,7 @@
 
 drop index CALENDAR_HOME_METADATA_RESOURCE_ID;
 alter table CALENDAR_HOME_METADATA
- add primary key(RESOURCE_ID);
+ add primary key (RESOURCE_ID);
 
 drop index INVITE_RESOURCE_ID;
 create index INVITE_RESOURCE_ID on INVITE(RESOURCE_ID);
@@ -43,7 +43,7 @@
 drop index ATTACHMENT_DROPBOX_ID;
 alter table ATTACHMENT
  drop constraint ATTACHMENT_DROPBOX_ID_PATH_KEY,
- add primary key(DROPBOX_ID, PATH);
+ add primary key (DROPBOX_ID, PATH);
 create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
   ATTACHMENT(CALENDAR_HOME_RESOURCE_ID);
 
@@ -51,7 +51,7 @@
   
 drop index ADDRESSBOOK_HOME_METADATA_RESOURCE_ID;
 alter table ADDRESSBOOK_HOME_METADATA
- add primary key(RESOURCE_ID);
+ add primary key (RESOURCE_ID);
 
 drop index ADDRESSBOOK_BIND_HOME_RESOURCE_ID;
 
@@ -73,7 +73,7 @@
 
 alter table CALENDARSERVER
  drop constraint CALENDARSERVER_NAME_KEY,
- add primary key(NAME);
+ add primary key (NAME);
 
 -- Now update the version
 update CALENDARSERVER set VALUE = '5' where NAME = 'VERSION';

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_5_to_6.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_5_to_6.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_5_to_6.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -27,7 +27,7 @@
   RESOURCE_KEY                  varchar(255) not null,
   MODIFIED                      integer not null,
   SUBSCRIBER_GUID               varchar(255) not null,
-  unique(TOKEN, RESOURCE_KEY) -- implicit index
+  unique (TOKEN, RESOURCE_KEY) -- implicit index
 );
 
 create index APN_SUBSCRIPTIONS_RESOURCE_KEY

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_6_to_7.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_6_to_7.sql	2015-11-15 18:08:03 UTC (rev 15312)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_6_to_7.sql	2015-11-15 18:17:50 UTC (rev 15313)
@@ -55,7 +55,7 @@
 -- Change a constraint
 alter table APN_SUBSCRIPTIONS
  drop constraint APN_SUBSCRIPTIONS_TOKEN_RESOURCE_KEY_KEY,
- add primary key(TOKEN, RESOURCE_KEY);
+ add primary key (TOKEN, RESOURCE_KEY);
 
 -- Now update the version
 update CALENDARSERVER set VALUE = '7' where NAME = 'VERSION';
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151115/6c34364a/attachment-0001.html>


More information about the calendarserver-changes mailing list