[CalendarServer-changes] [14581] CalendarServer/trunk/txdav/common/datastore

source_changes at macosforge.org source_changes at macosforge.org
Thu Mar 12 12:58:18 PDT 2015


Revision: 14581
          http://trac.calendarserver.org//changeset/14581
Author:   cdaboo at apple.com
Date:     2015-03-12 12:58:18 -0700 (Thu, 12 Mar 2015)
Log Message:
-----------
Fix Oracle schema issues.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v40.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v41.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v42.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v43.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v44.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v45.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v46.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v47.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v48.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v49.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v50.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v51.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v52.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v40.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v41.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v42.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v43.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v44.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v45.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v46.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v47.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/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/upgrades/oracle-dialect/upgrade_from_39_to_40.sql
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_46_to_47.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_46_to_47.sql
    CalendarServer/trunk/txdav/common/datastore/sql_tables.py

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -656,353 +656,344 @@
 insert into CALENDARSERVER (NAME, VALUE) values ('NOTIFICATION-DATAVERSION', '1');
 insert into CALENDARSERVER (NAME, VALUE) values ('MIN-VALID-REVISION', '1');
 create index CALENDAR_HOME_METADAT_475de898 on CALENDAR_HOME_METADATA (
-    TRASH
+    "TRASH"
 );
 
 create index CALENDAR_HOME_METADAT_3cb9049e on CALENDAR_HOME_METADATA (
-    DEFAULT_EVENTS
+    "DEFAULT_EVENTS"
 );
 
 create index CALENDAR_HOME_METADAT_d55e5548 on CALENDAR_HOME_METADATA (
-    DEFAULT_TASKS
+    "DEFAULT_TASKS"
 );
 
 create index CALENDAR_HOME_METADAT_910264ce on CALENDAR_HOME_METADATA (
-    DEFAULT_POLLS
+    "DEFAULT_POLLS"
 );
 
 create index CALENDAR_MIGRATION_LO_0525c72b on CALENDAR_MIGRATION (
-    LOCAL_RESOURCE_ID
+    "LOCAL_RESOURCE_ID"
 );
 
 create index NOTIFICATION_NOTIFICA_f891f5f9 on NOTIFICATION (
-    NOTIFICATION_HOME_RESOURCE_ID
+    "NOTIFICATION_HOME_RESOURCE_ID"
 );
 
 create index CALENDAR_BIND_RESOURC_e57964d4 on CALENDAR_BIND (
-    CALENDAR_RESOURCE_ID
+    "CALENDAR_RESOURCE_ID"
 );
 
 create index CALENDAR_OBJECT_CALEN_a9a453a9 on CALENDAR_OBJECT (
-    CALENDAR_RESOURCE_ID,
-    ICALENDAR_UID
+    "CALENDAR_RESOURCE_ID",
+    "ICALENDAR_UID"
 );
 
 create index CALENDAR_OBJECT_CALEN_c4dc619c on CALENDAR_OBJECT (
-    CALENDAR_RESOURCE_ID,
-    RECURRANCE_MAX,
-    RECURRANCE_MIN
+    "CALENDAR_RESOURCE_ID",
+    "RECURRANCE_MAX",
+    "RECURRANCE_MIN"
 );
 
 create index CALENDAR_OBJECT_ICALE_82e731d5 on CALENDAR_OBJECT (
-    ICALENDAR_UID
+    "ICALENDAR_UID"
 );
 
 create index CALENDAR_OBJECT_DROPB_de041d80 on CALENDAR_OBJECT (
-    DROPBOX_ID
+    "DROPBOX_ID"
 );
 
 create index TIME_RANGE_CALENDAR_R_beb6e7eb on TIME_RANGE (
-    CALENDAR_RESOURCE_ID
+    "CALENDAR_RESOURCE_ID"
 );
 
 create index TIME_RANGE_CALENDAR_O_acf37bd1 on TIME_RANGE (
-    CALENDAR_OBJECT_RESOURCE_ID
+    "CALENDAR_OBJECT_RESOURCE_ID"
 );
 
 create index CALENDAR_OBJECT_MIGRA_0502cbef on CALENDAR_OBJECT_MIGRATION (
-    CALENDAR_HOME_RESOURCE_ID,
-    LOCAL_RESOURCE_ID
+    "CALENDAR_HOME_RESOURCE_ID",
+    "LOCAL_RESOURCE_ID"
 );
 
 create index CALENDAR_OBJECT_MIGRA_3577efd9 on CALENDAR_OBJECT_MIGRATION (
-    LOCAL_RESOURCE_ID
+    "LOCAL_RESOURCE_ID"
 );
 
 create index ATTACHMENT_CALENDAR_H_0078845c on ATTACHMENT (
-    CALENDAR_HOME_RESOURCE_ID
+    "CALENDAR_HOME_RESOURCE_ID"
 );
 
 create index ATTACHMENT_DROPBOX_ID_5073cf23 on ATTACHMENT (
-    DROPBOX_ID
+    "DROPBOX_ID"
 );
 
 create index ATTACHMENT_CALENDAR_O_81508484 on ATTACHMENT_CALENDAR_OBJECT (
-    CALENDAR_OBJECT_RESOURCE_ID
+    "CALENDAR_OBJECT_RESOURCE_ID"
 );
 
 create index ATTACHMENT_MIGRATION__804bf85e on ATTACHMENT_MIGRATION (
-    CALENDAR_HOME_RESOURCE_ID,
-    LOCAL_RESOURCE_ID
+    "CALENDAR_HOME_RESOURCE_ID",
+    "LOCAL_RESOURCE_ID"
 );
 
 create index ATTACHMENT_MIGRATION__816947fe on ATTACHMENT_MIGRATION (
-    LOCAL_RESOURCE_ID
+    "LOCAL_RESOURCE_ID"
 );
 
 create index SHARED_ADDRESSBOOK_BI_e9a2e6d4 on SHARED_ADDRESSBOOK_BIND (
-    OWNER_HOME_RESOURCE_ID
+    "OWNER_HOME_RESOURCE_ID"
 );
 
 create index ABO_MEMBERS_ADDRESSBO_4effa879 on ABO_MEMBERS (
-    ADDRESSBOOK_ID
+    "ADDRESSBOOK_ID"
 );
 
 create index ABO_MEMBERS_MEMBER_ID_8d66adcf on ABO_MEMBERS (
-    MEMBER_ID
+    "MEMBER_ID"
 );
 
 create index ABO_FOREIGN_MEMBERS_A_1fd2c5e9 on ABO_FOREIGN_MEMBERS (
-    ADDRESSBOOK_ID
+    "ADDRESSBOOK_ID"
 );
 
 create index SHARED_GROUP_BIND_RES_cf52f95d on SHARED_GROUP_BIND (
-    GROUP_RESOURCE_ID
+    "GROUP_RESOURCE_ID"
 );
 
 create index CALENDAR_OBJECT_REVIS_6d9d929c on CALENDAR_OBJECT_REVISIONS (
-    CALENDAR_RESOURCE_ID,
-    RESOURCE_NAME,
-    DELETED,
-    REVISION
+    "CALENDAR_RESOURCE_ID",
+    "RESOURCE_NAME",
+    "DELETED",
+    "REVISION"
 );
 
 create index CALENDAR_OBJECT_REVIS_265c8acf on CALENDAR_OBJECT_REVISIONS (
-    CALENDAR_RESOURCE_ID,
-    REVISION
+    "CALENDAR_RESOURCE_ID",
+    "REVISION"
 );
 
 create index CALENDAR_OBJECT_REVIS_550b1c56 on CALENDAR_OBJECT_REVISIONS (
-    CALENDAR_HOME_RESOURCE_ID,
-    REVISION
+    "CALENDAR_HOME_RESOURCE_ID",
+    "REVISION"
 );
 
 create index ADDRESSBOOK_OBJECT_RE_00fe8288 on ADDRESSBOOK_OBJECT_REVISIONS (
-    OWNER_HOME_RESOURCE_ID,
-    RESOURCE_NAME,
-    DELETED,
-    REVISION
+    "OWNER_HOME_RESOURCE_ID",
+    "RESOURCE_NAME",
+    "DELETED",
+    "REVISION"
 );
 
 create index ADDRESSBOOK_OBJECT_RE_45004780 on ADDRESSBOOK_OBJECT_REVISIONS (
-    OWNER_HOME_RESOURCE_ID,
-    REVISION
+    "OWNER_HOME_RESOURCE_ID",
+    "REVISION"
 );
 
 create index NOTIFICATION_OBJECT_R_036a9cee on NOTIFICATION_OBJECT_REVISIONS (
-    NOTIFICATION_HOME_RESOURCE_ID,
-    REVISION
+    "NOTIFICATION_HOME_RESOURCE_ID",
+    "REVISION"
 );
 
 create index APN_SUBSCRIPTIONS_RES_9610d78e on APN_SUBSCRIPTIONS (
-    RESOURCE_KEY
+    "RESOURCE_KEY"
 );
 
 create index IMIP_TOKENS_TOKEN_e94b918f on IMIP_TOKENS (
-    TOKEN
+    "TOKEN"
 );
 
 create index IMIP_INVITATION_WORK__586d064c on IMIP_INVITATION_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index IMIP_POLLING_WORK_JOB_d5535891 on IMIP_POLLING_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index IMIP_REPLY_WORK_JOB_I_bf4ae73e on IMIP_REPLY_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index PUSH_NOTIFICATION_WOR_8bbab117 on PUSH_NOTIFICATION_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index PUSH_NOTIFICATION_WOR_3a3ee588 on PUSH_NOTIFICATION_WORK (
-    PUSH_ID
+    "PUSH_ID"
 );
 
 create index GROUP_CACHER_POLLING__6eb3151c on GROUP_CACHER_POLLING_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index GROUP_REFRESH_WORK_JO_717ede20 on GROUP_REFRESH_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index GROUP_REFRESH_WORK_GR_0325f3a8 on GROUP_REFRESH_WORK (
-    GROUP_UID
+    "GROUP_UID"
 );
 
 create index GROUP_DELEGATE_CHANGE_8bf9e6d8 on GROUP_DELEGATE_CHANGES_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index GROUP_DELEGATE_CHANGE_d8f7af69 on GROUP_DELEGATE_CHANGES_WORK (
-    DELEGATOR_UID
+    "DELEGATOR_UID"
 );
 
-create index GROUPS_GROUP_UID_b35cce23 on GROUPS (
-    GROUP_UID
-);
-
 create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
-    MEMBER_UID
+    "MEMBER_UID"
 );
 
 create index GROUP_ATTENDEE_RECONC_da73d3c2 on GROUP_ATTENDEE_RECONCILE_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index GROUP_ATTENDEE_RECONC_b894ee7a on GROUP_ATTENDEE_RECONCILE_WORK (
-    RESOURCE_ID
+    "RESOURCE_ID"
 );
 
 create index GROUP_ATTENDEE_RECONC_5eabc549 on GROUP_ATTENDEE_RECONCILE_WORK (
-    GROUP_ID
+    "GROUP_ID"
 );
 
 create index GROUP_ATTENDEE_RESOUR_855124dc on GROUP_ATTENDEE (
-    RESOURCE_ID
+    "RESOURCE_ID"
 );
 
 create index GROUP_SHAREE_RECONCIL_9aad0858 on GROUP_SHAREE_RECONCILE_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index GROUP_SHAREE_RECONCIL_4dc60f78 on GROUP_SHAREE_RECONCILE_WORK (
-    CALENDAR_ID
+    "CALENDAR_ID"
 );
 
 create index GROUP_SHAREE_RECONCIL_1d14c921 on GROUP_SHAREE_RECONCILE_WORK (
-    GROUP_ID
+    "GROUP_ID"
 );
 
 create index GROUP_SHAREE_CALENDAR_28a88850 on GROUP_SHAREE (
-    CALENDAR_ID
+    "CALENDAR_ID"
 );
 
 create index DELEGATE_TO_DELEGATOR_5e149b11 on DELEGATES (
-    DELEGATE,
-    READ_WRITE,
-    DELEGATOR
+    "DELEGATE",
+    "READ_WRITE",
+    "DELEGATOR"
 );
 
 create index DELEGATE_GROUPS_GROUP_25117446 on DELEGATE_GROUPS (
-    GROUP_ID
+    "GROUP_ID"
 );
 
 create index CALENDAR_OBJECT_SPLIT_af71dcda on CALENDAR_OBJECT_SPLITTER_WORK (
-    RESOURCE_ID
+    "RESOURCE_ID"
 );
 
 create index CALENDAR_OBJECT_SPLIT_33603b72 on CALENDAR_OBJECT_SPLITTER_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index CALENDAR_OBJECT_UPGRA_a5c181eb on CALENDAR_OBJECT_UPGRADE_WORK (
-    RESOURCE_ID
+    "RESOURCE_ID"
 );
 
 create index CALENDAR_OBJECT_UPGRA_39d6f8f9 on CALENDAR_OBJECT_UPGRADE_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index FIND_MIN_VALID_REVISI_78d17400 on FIND_MIN_VALID_REVISION_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index REVISION_CLEANUP_WORK_eb062686 on REVISION_CLEANUP_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index INBOX_CLEANUP_WORK_JO_799132bd on INBOX_CLEANUP_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index CLEANUP_ONE_INBOX_WOR_375dac36 on CLEANUP_ONE_INBOX_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index SCHEDULE_WORK_JOB_ID_65e810ee on SCHEDULE_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index SCHEDULE_WORK_ICALEND_089f33dc on SCHEDULE_WORK (
-    ICALENDAR_UID
+    "ICALENDAR_UID"
 );
 
 create index SCHEDULE_REFRESH_WORK_26084c7b on SCHEDULE_REFRESH_WORK (
-    HOME_RESOURCE_ID
+    "HOME_RESOURCE_ID"
 );
 
 create index SCHEDULE_REFRESH_WORK_989efe54 on SCHEDULE_REFRESH_WORK (
-    RESOURCE_ID
+    "RESOURCE_ID"
 );
 
-create index SCHEDULE_REFRESH_ATTE_83053b91 on SCHEDULE_REFRESH_ATTENDEES (
-    RESOURCE_ID,
-    ATTENDEE
-);
-
 create index SCHEDULE_AUTO_REPLY_W_0256478d on SCHEDULE_AUTO_REPLY_WORK (
-    HOME_RESOURCE_ID
+    "HOME_RESOURCE_ID"
 );
 
 create index SCHEDULE_AUTO_REPLY_W_0755e754 on SCHEDULE_AUTO_REPLY_WORK (
-    RESOURCE_ID
+    "RESOURCE_ID"
 );
 
 create index SCHEDULE_ORGANIZER_WO_18ce4edd on SCHEDULE_ORGANIZER_WORK (
-    HOME_RESOURCE_ID
+    "HOME_RESOURCE_ID"
 );
 
 create index SCHEDULE_ORGANIZER_WO_14702035 on SCHEDULE_ORGANIZER_WORK (
-    RESOURCE_ID
+    "RESOURCE_ID"
 );
 
 create index SCHEDULE_ORGANIZER_SE_9ec9f827 on SCHEDULE_ORGANIZER_SEND_WORK (
-    HOME_RESOURCE_ID
+    "HOME_RESOURCE_ID"
 );
 
 create index SCHEDULE_ORGANIZER_SE_699fefc4 on SCHEDULE_ORGANIZER_SEND_WORK (
-    RESOURCE_ID
+    "RESOURCE_ID"
 );
 
 create index SCHEDULE_REPLY_WORK_H_745af8cf on SCHEDULE_REPLY_WORK (
-    HOME_RESOURCE_ID
+    "HOME_RESOURCE_ID"
 );
 
 create index SCHEDULE_REPLY_WORK_R_11bd3fbb on SCHEDULE_REPLY_WORK (
-    RESOURCE_ID
+    "RESOURCE_ID"
 );
 
 create index PRINCIPAL_PURGE_POLLI_6383e68a on PRINCIPAL_PURGE_POLLING_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index PRINCIPAL_PURGE_CHECK_b0c024c1 on PRINCIPAL_PURGE_CHECK_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index PRINCIPAL_PURGE_CHECK_198388a5 on PRINCIPAL_PURGE_CHECK_WORK (
-    UID
+    "UID"
 );
 
 create index PRINCIPAL_PURGE_WORK__7a8141a3 on PRINCIPAL_PURGE_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index PRINCIPAL_PURGE_WORK__db35cfdc on PRINCIPAL_PURGE_WORK (
-    UID
+    "UID"
 );
 
 create index PRINCIPAL_PURGE_HOME__f35eea7a on PRINCIPAL_PURGE_HOME_WORK (
-    JOB_ID
+    "JOB_ID"
 );
 
 create index PRINCIPAL_PURGE_HOME__967e4480 on PRINCIPAL_PURGE_HOME_WORK (
-    HOME_RESOURCE_ID
+    "HOME_RESOURCE_ID"
 );
 
 -- Extra schema to add to current-oracle-dialect.sql

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -864,14 +864,12 @@
 create table GROUPS (
   GROUP_ID                      integer      primary key default nextval('RESOURCE_ID_SEQ'),    -- implicit index
   NAME                          varchar(255) not null,
-  GROUP_UID                     varchar(255) not null unique,
+  GROUP_UID                     varchar(255) not null unique,									-- implicit index
   MEMBERSHIP_HASH               varchar(255) not null,
   EXTANT                        integer default 1,
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP)
 );
-create index GROUPS_GROUP_UID on
-  GROUPS(GROUP_UID);
 
 create table GROUP_MEMBERSHIP (
   GROUP_ID                     integer not null references GROUPS on delete cascade,
@@ -1078,9 +1076,6 @@
   primary key (RESOURCE_ID, ATTENDEE)
 );
 
-create index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE on
-  SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
-
 ------------------------------
 -- Schedule Auto Reply Work --
 ------------------------------

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v40.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v40.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v40.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -780,11 +780,6 @@
     JOB_ID
 );
 
-create index SCHEDULE_REFRESH_ATTE_83053b91 on SCHEDULE_REFRESH_ATTENDEES (
-    RESOURCE_ID,
-    ATTENDEE
-);
-
 create index SCHEDULE_AUTO_REPLY_W_0256478d on SCHEDULE_AUTO_REPLY_WORK (
     HOME_RESOURCE_ID
 );

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v41.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v41.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v41.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -787,11 +787,6 @@
     JOB_ID
 );
 
-create index SCHEDULE_REFRESH_ATTE_83053b91 on SCHEDULE_REFRESH_ATTENDEES (
-    RESOURCE_ID,
-    ATTENDEE
-);
-
 create index SCHEDULE_AUTO_REPLY_W_0256478d on SCHEDULE_AUTO_REPLY_WORK (
     HOME_RESOURCE_ID
 );

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v42.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v42.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v42.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -788,11 +788,6 @@
     JOB_ID
 );
 
-create index SCHEDULE_REFRESH_ATTE_83053b91 on SCHEDULE_REFRESH_ATTENDEES (
-    RESOURCE_ID,
-    ATTENDEE
-);
-
 create index SCHEDULE_AUTO_REPLY_W_0256478d on SCHEDULE_AUTO_REPLY_WORK (
     HOME_RESOURCE_ID
 );

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v43.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v43.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v43.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -789,11 +789,6 @@
     JOB_ID
 );
 
-create index SCHEDULE_REFRESH_ATTE_83053b91 on SCHEDULE_REFRESH_ATTENDEES (
-    RESOURCE_ID,
-    ATTENDEE
-);
-
 create index SCHEDULE_AUTO_REPLY_W_0256478d on SCHEDULE_AUTO_REPLY_WORK (
     HOME_RESOURCE_ID
 );

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v44.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v44.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v44.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -800,11 +800,6 @@
     RESOURCE_ID
 );
 
-create index SCHEDULE_REFRESH_ATTE_83053b91 on SCHEDULE_REFRESH_ATTENDEES (
-    RESOURCE_ID,
-    ATTENDEE
-);
-
 create index SCHEDULE_AUTO_REPLY_W_0256478d on SCHEDULE_AUTO_REPLY_WORK (
     HOME_RESOURCE_ID
 );

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v45.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v45.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v45.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -802,11 +802,6 @@
     RESOURCE_ID
 );
 
-create index SCHEDULE_REFRESH_ATTE_83053b91 on SCHEDULE_REFRESH_ATTENDEES (
-    RESOURCE_ID,
-    ATTENDEE
-);
-
 create index SCHEDULE_AUTO_REPLY_W_0256478d on SCHEDULE_AUTO_REPLY_WORK (
     HOME_RESOURCE_ID
 );

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v46.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v46.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v46.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -844,11 +844,6 @@
     RESOURCE_ID
 );
 
-create index SCHEDULE_REFRESH_ATTE_83053b91 on SCHEDULE_REFRESH_ATTENDEES (
-    RESOURCE_ID,
-    ATTENDEE
-);
-
 create index SCHEDULE_AUTO_REPLY_W_0256478d on SCHEDULE_AUTO_REPLY_WORK (
     HOME_RESOURCE_ID
 );

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v47.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v47.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v47.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -766,10 +766,6 @@
     JOB_ID
 );
 
-create index GROUPS_GROUP_UID_b35cce23 on GROUPS (
-    GROUP_UID
-);
-
 create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
     MEMBER_UID
 );
@@ -856,11 +852,6 @@
     RESOURCE_ID
 );
 
-create index SCHEDULE_REFRESH_ATTE_83053b91 on SCHEDULE_REFRESH_ATTENDEES (
-    RESOURCE_ID,
-    ATTENDEE
-);
-
 create index SCHEDULE_AUTO_REPLY_W_0256478d on SCHEDULE_AUTO_REPLY_WORK (
     HOME_RESOURCE_ID
 );

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v48.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v48.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v48.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -755,10 +755,6 @@
     JOB_ID
 );
 
-create index GROUPS_GROUP_UID_b35cce23 on GROUPS (
-    GROUP_UID
-);
-
 create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
     MEMBER_UID
 );
@@ -845,11 +841,6 @@
     RESOURCE_ID
 );
 
-create index SCHEDULE_REFRESH_ATTE_83053b91 on SCHEDULE_REFRESH_ATTENDEES (
-    RESOURCE_ID,
-    ATTENDEE
-);
-
 create index SCHEDULE_AUTO_REPLY_W_0256478d on SCHEDULE_AUTO_REPLY_WORK (
     HOME_RESOURCE_ID
 );

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v49.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v49.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v49.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -773,10 +773,6 @@
     DELEGATOR_UID
 );
 
-create index GROUPS_GROUP_UID_b35cce23 on GROUPS (
-    GROUP_UID
-);
-
 create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
     MEMBER_UID
 );
@@ -863,11 +859,6 @@
     RESOURCE_ID
 );
 
-create index SCHEDULE_REFRESH_ATTE_83053b91 on SCHEDULE_REFRESH_ATTENDEES (
-    RESOURCE_ID,
-    ATTENDEE
-);
-
 create index SCHEDULE_AUTO_REPLY_W_0256478d on SCHEDULE_AUTO_REPLY_WORK (
     HOME_RESOURCE_ID
 );

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v50.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v50.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v50.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -767,10 +767,6 @@
     DELEGATOR_UID
 );
 
-create index GROUPS_GROUP_UID_b35cce23 on GROUPS (
-    GROUP_UID
-);
-
 create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
     MEMBER_UID
 );
@@ -857,11 +853,6 @@
     RESOURCE_ID
 );
 
-create index SCHEDULE_REFRESH_ATTE_83053b91 on SCHEDULE_REFRESH_ATTENDEES (
-    RESOURCE_ID,
-    ATTENDEE
-);
-
 create index SCHEDULE_AUTO_REPLY_W_0256478d on SCHEDULE_AUTO_REPLY_WORK (
     HOME_RESOURCE_ID
 );

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v51.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v51.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v51.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -773,10 +773,6 @@
     DELEGATOR_UID
 );
 
-create index GROUPS_GROUP_UID_b35cce23 on GROUPS (
-    GROUP_UID
-);
-
 create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
     MEMBER_UID
 );
@@ -871,11 +867,6 @@
     RESOURCE_ID
 );
 
-create index SCHEDULE_REFRESH_ATTE_83053b91 on SCHEDULE_REFRESH_ATTENDEES (
-    RESOURCE_ID,
-    ATTENDEE
-);
-
 create index SCHEDULE_AUTO_REPLY_W_0256478d on SCHEDULE_AUTO_REPLY_WORK (
     HOME_RESOURCE_ID
 );

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v52.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v52.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v52.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -822,10 +822,6 @@
     DELEGATOR_UID
 );
 
-create index GROUPS_GROUP_UID_b35cce23 on GROUPS (
-    GROUP_UID
-);
-
 create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
     MEMBER_UID
 );
@@ -920,11 +916,6 @@
     RESOURCE_ID
 );
 
-create index SCHEDULE_REFRESH_ATTE_83053b91 on SCHEDULE_REFRESH_ATTENDEES (
-    RESOURCE_ID,
-    ATTENDEE
-);
-
 create index SCHEDULE_AUTO_REPLY_W_0256478d on SCHEDULE_AUTO_REPLY_WORK (
     HOME_RESOURCE_ID
 );

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v40.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v40.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v40.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -920,9 +920,6 @@
   primary key (RESOURCE_ID, ATTENDEE)
 );
 
-create index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE on
-  SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
-
 ------------------------------
 -- Schedule Auto Reply Work --
 ------------------------------

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v41.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v41.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v41.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -921,9 +921,6 @@
   primary key (RESOURCE_ID, ATTENDEE)
 );
 
-create index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE on
-  SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
-
 ------------------------------
 -- Schedule Auto Reply Work --
 ------------------------------

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v42.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v42.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v42.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -922,9 +922,6 @@
   primary key (RESOURCE_ID, ATTENDEE)
 );
 
-create index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE on
-  SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
-
 ------------------------------
 -- Schedule Auto Reply Work --
 ------------------------------

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v43.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v43.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v43.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -923,9 +923,6 @@
   primary key (RESOURCE_ID, ATTENDEE)
 );
 
-create index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE on
-  SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
-
 ------------------------------
 -- Schedule Auto Reply Work --
 ------------------------------

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v44.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v44.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v44.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -926,9 +926,6 @@
   primary key (RESOURCE_ID, ATTENDEE)
 );
 
-create index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE on
-  SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
-
 ------------------------------
 -- Schedule Auto Reply Work --
 ------------------------------

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v45.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v45.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v45.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -928,9 +928,6 @@
   primary key (RESOURCE_ID, ATTENDEE)
 );
 
-create index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE on
-  SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
-
 ------------------------------
 -- Schedule Auto Reply Work --
 ------------------------------

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v46.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v46.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v46.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -964,9 +964,6 @@
   primary key (RESOURCE_ID, ATTENDEE)
 );
 
-create index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE on
-  SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
-
 ------------------------------
 -- Schedule Auto Reply Work --
 ------------------------------

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v47.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v47.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v47.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -776,14 +776,12 @@
 create table GROUPS (
   GROUP_ID                      integer      primary key default nextval('RESOURCE_ID_SEQ'),    -- implicit index
   NAME                          varchar(255) not null,
-  GROUP_UID                     varchar(255) not null unique,
+  GROUP_UID                     varchar(255) not null unique,    -- implicit index
   MEMBERSHIP_HASH               varchar(255) not null,
   EXTANT                        integer default 1,
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP)
 );
-create index GROUPS_GROUP_UID on
-  GROUPS(GROUP_UID);
 
 create table GROUP_MEMBERSHIP (
   GROUP_ID                     integer not null references GROUPS on delete cascade,
@@ -975,9 +973,6 @@
   primary key (RESOURCE_ID, ATTENDEE)
 );
 
-create index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE on
-  SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
-
 ------------------------------
 -- Schedule Auto Reply Work --
 ------------------------------

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-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v48.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -773,14 +773,12 @@
 create table GROUPS (
   GROUP_ID                      integer      primary key default nextval('RESOURCE_ID_SEQ'),    -- implicit index
   NAME                          varchar(255) not null,
-  GROUP_UID                     varchar(255) not null unique,
+  GROUP_UID                     varchar(255) not null unique,    -- implicit index
   MEMBERSHIP_HASH               varchar(255) not null,
   EXTANT                        integer default 1,
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP)
 );
-create index GROUPS_GROUP_UID on
-  GROUPS(GROUP_UID);
 
 create table GROUP_MEMBERSHIP (
   GROUP_ID                     integer not null references GROUPS on delete cascade,
@@ -972,9 +970,6 @@
   primary key (RESOURCE_ID, ATTENDEE)
 );
 
-create index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE on
-  SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
-
 ------------------------------
 -- Schedule Auto Reply Work --
 ------------------------------

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-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v49.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -782,14 +782,12 @@
 create table GROUPS (
   GROUP_ID                      integer      primary key default nextval('RESOURCE_ID_SEQ'),    -- implicit index
   NAME                          varchar(255) not null,
-  GROUP_UID                     varchar(255) not null unique,
+  GROUP_UID                     varchar(255) not null unique,    -- implicit index
   MEMBERSHIP_HASH               varchar(255) not null,
   EXTANT                        integer default 1,
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP)
 );
-create index GROUPS_GROUP_UID on
-  GROUPS(GROUP_UID);
 
 create table GROUP_MEMBERSHIP (
   GROUP_ID                     integer not null references GROUPS on delete cascade,
@@ -981,9 +979,6 @@
   primary key (RESOURCE_ID, ATTENDEE)
 );
 
-create index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE on
-  SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
-
 ------------------------------
 -- Schedule Auto Reply Work --
 ------------------------------

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-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v50.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -782,14 +782,12 @@
 create table GROUPS (
   GROUP_ID                      integer      primary key default nextval('RESOURCE_ID_SEQ'),    -- implicit index
   NAME                          varchar(255) not null,
-  GROUP_UID                     varchar(255) not null unique,
+  GROUP_UID                     varchar(255) not null unique,    -- implicit index
   MEMBERSHIP_HASH               varchar(255) not null,
   EXTANT                        integer default 1,
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP)
 );
-create index GROUPS_GROUP_UID on
-  GROUPS(GROUP_UID);
 
 create table GROUP_MEMBERSHIP (
   GROUP_ID                     integer not null references GROUPS on delete cascade,
@@ -981,9 +979,6 @@
   primary key (RESOURCE_ID, ATTENDEE)
 );
 
-create index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE on
-  SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
-
 ------------------------------
 -- Schedule Auto Reply Work --
 ------------------------------

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-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v51.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -782,14 +782,12 @@
 create table GROUPS (
   GROUP_ID                      integer      primary key default nextval('RESOURCE_ID_SEQ'),    -- implicit index
   NAME                          varchar(255) not null,
-  GROUP_UID                     varchar(255) not null unique,
+  GROUP_UID                     varchar(255) not null unique,    -- implicit index
   MEMBERSHIP_HASH               varchar(255) not null,
   EXTANT                        integer default 1,
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP)
 );
-create index GROUPS_GROUP_UID on
-  GROUPS(GROUP_UID);
 
 create table GROUP_MEMBERSHIP (
   GROUP_ID                     integer not null references GROUPS on delete cascade,
@@ -996,9 +994,6 @@
   primary key (RESOURCE_ID, ATTENDEE)
 );
 
-create index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE on
-  SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
-
 ------------------------------
 -- Schedule Auto Reply Work --
 ------------------------------

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-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v52.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -843,14 +843,12 @@
 create table GROUPS (
   GROUP_ID                      integer      primary key default nextval('RESOURCE_ID_SEQ'),    -- implicit index
   NAME                          varchar(255) not null,
-  GROUP_UID                     varchar(255) not null unique,
+  GROUP_UID                     varchar(255) not null unique,    -- implicit index
   MEMBERSHIP_HASH               varchar(255) not null,
   EXTANT                        integer default 1,
   CREATED                       timestamp default timezone('UTC', CURRENT_TIMESTAMP),
   MODIFIED                      timestamp default timezone('UTC', CURRENT_TIMESTAMP)
 );
-create index GROUPS_GROUP_UID on
-  GROUPS(GROUP_UID);
 
 create table GROUP_MEMBERSHIP (
   GROUP_ID                     integer not null references GROUPS on delete cascade,
@@ -1057,9 +1055,6 @@
   primary key (RESOURCE_ID, ATTENDEE)
 );
 
-create index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE on
-  SCHEDULE_REFRESH_ATTENDEES(RESOURCE_ID, ATTENDEE);
-
 ------------------------------
 -- Schedule Auto Reply Work --
 ------------------------------

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_39_to_40.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_39_to_40.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_39_to_40.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -37,6 +37,7 @@
     GROUP_ID
 );
 
+drop index SCHEDULE_REFRESH_ATTE_83053b91;
 alter table SCHEDULE_REFRESH_ATTENDEES add
   primary key ("RESOURCE_ID", "ATTENDEE");
 

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_46_to_47.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_46_to_47.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_46_to_47.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -33,6 +33,7 @@
 
 
 -- Add "unique" to GROUPS.GROUP_UID
+drop index GROUPS_GROUP_UID_b35cce23;
 alter table GROUPS add unique (GROUP_UID);
 
 

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-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_39_to_40.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -35,6 +35,7 @@
 create index DELEGATE_GROUPS_GROUP_ID on
   DELEGATE_GROUPS(GROUP_ID);
 
+drop index SCHEDULE_REFRESH_ATTENDEES_RESOURCE_ID_ATTENDEE;
 alter table SCHEDULE_REFRESH_ATTENDEES add
   primary key(RESOURCE_ID, ATTENDEE);
 

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_46_to_47.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_46_to_47.sql	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_46_to_47.sql	2015-03-12 19:58:18 UTC (rev 14581)
@@ -33,6 +33,7 @@
 
 
 -- Add "unique" to GROUPS.GROUP_UID
+drop index GROUPS_GROUP_UID;
 alter table GROUPS add unique (GROUP_UID);
 
 

Modified: CalendarServer/trunk/txdav/common/datastore/sql_tables.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_tables.py	2015-03-12 19:50:10 UTC (rev 14580)
+++ CalendarServer/trunk/txdav/common/datastore/sql_tables.py	2015-03-12 19:58:18 UTC (rev 14581)
@@ -435,7 +435,7 @@
         out.write(
             'create index %s on %s (\n    ' % (shortIndexName, shortTableName)
         )
-        out.write(',\n    '.join([column.name for column in index.columns]))
+        out.write(',\n    '.join(["\"{}\"".format(column.name) for column in index.columns]))
         out.write('\n);\n\n')
 
     # Functions are skipped as they likely use dialect specific syntax. Instead, functions
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150312/4e07f7c2/attachment-0001.html>


More information about the calendarserver-changes mailing list