[CalendarServer-changes] [14589] CalendarServer/branches/release/CalendarServer-6.1-dev
source_changes at macosforge.org
source_changes at macosforge.org
Fri Mar 13 12:22:11 PDT 2015
Revision: 14589
http://trac.calendarserver.org//changeset/14589
Author: cdaboo at apple.com
Date: 2015-03-13 12:22:11 -0700 (Fri, 13 Mar 2015)
Log Message:
-----------
Pull up r14581 for Oracle schema fixes.
Revision Links:
--------------
http://trac.calendarserver.org//changeset/14581
Modified Paths:
--------------
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/current-oracle-dialect.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/current.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v40.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v41.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v42.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v43.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v44.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v45.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v46.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v47.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v48.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v49.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v50.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v40.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v41.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v42.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v43.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v44.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v45.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v46.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v47.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v48.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v49.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v50.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_39_to_40.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_46_to_47.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_39_to_40.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_46_to_47.sql
CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_tables.py
Property Changed:
----------------
CalendarServer/branches/release/CalendarServer-6.1-dev/
Property changes on: CalendarServer/branches/release/CalendarServer-6.1-dev
___________________________________________________________________
Modified: svn:mergeinfo
- /CalDAVTester/trunk:11193-11198
/CalendarServer/branches/config-separation:4379-4443
/CalendarServer/branches/egg-info-351:4589-4625
/CalendarServer/branches/generic-sqlstore:6167-6191
/CalendarServer/branches/new-store:5594-5934
/CalendarServer/branches/new-store-no-caldavfile:5911-5935
/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
/CalendarServer/branches/release/CalendarServer-5.2-dev:11972,12357-12358,12794,12814
/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
/CalendarServer/branches/users/cdaboo/cross-pod-sharing:12038-12191
/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
/CalendarServer/branches/users/cdaboo/json:11622-11912
/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
/CalendarServer/branches/users/cdaboo/pods:7297-7377
/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
/CalendarServer/branches/users/cdaboo/pycard:7227-7237
/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
/CalendarServer/branches/users/cdaboo/reverse-proxy-pods:11875-11900
/CalendarServer/branches/users/cdaboo/scheduling-queue-refresh:11783-12557
/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
/CalendarServer/branches/users/cdaboo/sharing-in-the-store:11935-12016
/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
/CalendarServer/branches/users/cdaboo/timezones:7443-7699
/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
/CalendarServer/branches/users/gaya/cleanrevisions:12152-12334
/CalendarServer/branches/users/gaya/groupsharee2:13669-13773
/CalendarServer/branches/users/gaya/sharedgroupfixes:12120-12142
/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
/CalendarServer/branches/users/glyph/conn-limit:6574-6577
/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
/CalendarServer/branches/users/glyph/dalify:6932-7023
/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
/CalendarServer/branches/users/glyph/deploybuild:7563-7572
/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
/CalendarServer/branches/users/glyph/disable-quota:7718-7727
/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
/CalendarServer/branches/users/glyph/hang-fix:11465-11491
/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
/CalendarServer/branches/users/glyph/linux-tests:6893-6900
/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
/CalendarServer/branches/users/glyph/new-export:7444-7485
/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
/CalendarServer/branches/users/glyph/oracle:7106-7155
/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
/CalendarServer/branches/users/glyph/other-html:8062-8091
/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
/CalendarServer/branches/users/glyph/q:9560-9688
/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
/CalendarServer/branches/users/glyph/quota:7604-7637
/CalendarServer/branches/users/glyph/sendfdport:5388-5424
/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
/CalendarServer/branches/users/glyph/sharedpool:6490-6550
/CalendarServer/branches/users/glyph/sharing-api:9192-9205
/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
/CalendarServer/branches/users/glyph/sql-store:5929-6073
/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
/CalendarServer/branches/users/glyph/subtransactions:7248-7258
/CalendarServer/branches/users/glyph/table-alias:8651-8664
/CalendarServer/branches/users/glyph/uidexport:7673-7676
/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
/CalendarServer/branches/users/glyph/whenNotProposed:11881-11897
/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
/CalendarServer/branches/users/sagen/applepush:8126-8184
/CalendarServer/branches/users/sagen/inboxitems:7380-7381
/CalendarServer/branches/users/sagen/locations-resources:5032-5051
/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
/CalendarServer/branches/users/sagen/move2who:12819-12860
/CalendarServer/branches/users/sagen/move2who-2:12861-12898
/CalendarServer/branches/users/sagen/move2who-3:12899-12913
/CalendarServer/branches/users/sagen/move2who-4:12914-13157
/CalendarServer/branches/users/sagen/move2who-5:13158-13163
/CalendarServer/branches/users/sagen/newcua:13309-13327
/CalendarServer/branches/users/sagen/newcua-1:13328-13330
/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
/CalendarServer/branches/users/sagen/recordtypes:13648-13656
/CalendarServer/branches/users/sagen/recordtypes-2:13657
/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/branches/users/sagen/resources-2:5084-5093
/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
/CalendarServer/branches/users/wsanchez/transations:5515-5593
/CalendarServer/trunk:14469,14492
+ /CalDAVTester/trunk:11193-11198
/CalendarServer/branches/config-separation:4379-4443
/CalendarServer/branches/egg-info-351:4589-4625
/CalendarServer/branches/generic-sqlstore:6167-6191
/CalendarServer/branches/new-store:5594-5934
/CalendarServer/branches/new-store-no-caldavfile:5911-5935
/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
/CalendarServer/branches/release/CalendarServer-5.2-dev:11972,12357-12358,12794,12814
/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
/CalendarServer/branches/users/cdaboo/cross-pod-sharing:12038-12191
/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
/CalendarServer/branches/users/cdaboo/json:11622-11912
/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
/CalendarServer/branches/users/cdaboo/pods:7297-7377
/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
/CalendarServer/branches/users/cdaboo/pycard:7227-7237
/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
/CalendarServer/branches/users/cdaboo/reverse-proxy-pods:11875-11900
/CalendarServer/branches/users/cdaboo/scheduling-queue-refresh:11783-12557
/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
/CalendarServer/branches/users/cdaboo/sharing-in-the-store:11935-12016
/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
/CalendarServer/branches/users/cdaboo/timezones:7443-7699
/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
/CalendarServer/branches/users/gaya/cleanrevisions:12152-12334
/CalendarServer/branches/users/gaya/groupsharee2:13669-13773
/CalendarServer/branches/users/gaya/sharedgroupfixes:12120-12142
/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
/CalendarServer/branches/users/glyph/conn-limit:6574-6577
/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
/CalendarServer/branches/users/glyph/dalify:6932-7023
/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
/CalendarServer/branches/users/glyph/deploybuild:7563-7572
/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
/CalendarServer/branches/users/glyph/disable-quota:7718-7727
/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
/CalendarServer/branches/users/glyph/hang-fix:11465-11491
/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
/CalendarServer/branches/users/glyph/linux-tests:6893-6900
/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
/CalendarServer/branches/users/glyph/new-export:7444-7485
/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
/CalendarServer/branches/users/glyph/oracle:7106-7155
/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
/CalendarServer/branches/users/glyph/other-html:8062-8091
/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
/CalendarServer/branches/users/glyph/q:9560-9688
/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
/CalendarServer/branches/users/glyph/quota:7604-7637
/CalendarServer/branches/users/glyph/sendfdport:5388-5424
/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
/CalendarServer/branches/users/glyph/sharedpool:6490-6550
/CalendarServer/branches/users/glyph/sharing-api:9192-9205
/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
/CalendarServer/branches/users/glyph/sql-store:5929-6073
/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
/CalendarServer/branches/users/glyph/subtransactions:7248-7258
/CalendarServer/branches/users/glyph/table-alias:8651-8664
/CalendarServer/branches/users/glyph/uidexport:7673-7676
/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
/CalendarServer/branches/users/glyph/whenNotProposed:11881-11897
/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
/CalendarServer/branches/users/sagen/applepush:8126-8184
/CalendarServer/branches/users/sagen/inboxitems:7380-7381
/CalendarServer/branches/users/sagen/locations-resources:5032-5051
/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
/CalendarServer/branches/users/sagen/move2who:12819-12860
/CalendarServer/branches/users/sagen/move2who-2:12861-12898
/CalendarServer/branches/users/sagen/move2who-3:12899-12913
/CalendarServer/branches/users/sagen/move2who-4:12914-13157
/CalendarServer/branches/users/sagen/move2who-5:13158-13163
/CalendarServer/branches/users/sagen/newcua:13309-13327
/CalendarServer/branches/users/sagen/newcua-1:13328-13330
/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
/CalendarServer/branches/users/sagen/recordtypes:13648-13656
/CalendarServer/branches/users/sagen/recordtypes-2:13657
/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
/CalendarServer/branches/users/sagen/resources-2:5084-5093
/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
/CalendarServer/branches/users/wsanchez/transations:5515-5593
/CalendarServer/trunk:13973,13982,13998,14004,14009,14410,14469,14492,14581
Modified: CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/current-oracle-dialect.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -613,327 +613,318 @@
insert into CALENDARSERVER (NAME, VALUE) values ('NOTIFICATION-DATAVERSION', '1');
insert into CALENDARSERVER (NAME, VALUE) values ('MIN-VALID-REVISION', '1');
create index CALENDAR_HOME_METADAT_3cb9049e on CALENDAR_HOME_METADATA (
- DEFAULT_EVENTS
+ "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 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 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 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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/current.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/current.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/current.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v40.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v40.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v40.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v41.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v41.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v41.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v42.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v42.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v42.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v43.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v43.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v43.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v44.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v44.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v44.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v45.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v45.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v45.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v46.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v46.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v46.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v47.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v47.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v47.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v48.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v48.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v48.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v49.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v49.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v49.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v50.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v50.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/oracle-dialect/v50.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v40.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v40.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v40.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v41.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v41.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v41.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v42.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v42.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v42.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v43.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v43.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v43.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v44.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v44.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v44.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v45.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v45.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v45.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v46.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v46.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v46.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v47.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v47.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v47.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v48.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v48.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v48.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v49.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v49.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v49.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v50.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v50.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/old/postgres-dialect/v50.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_39_to_40.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_39_to_40.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_39_to_40.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_46_to_47.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_46_to_47.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_46_to_47.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_39_to_40.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_39_to_40.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_39_to_40.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -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/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_46_to_47.sql
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_46_to_47.sql 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_46_to_47.sql 2015-03-13 19:22:11 UTC (rev 14589)
@@ -33,6 +33,7 @@
-- Add "unique" to GROUPS.GROUP_UID
+drop index GROUPS_GROUP_UID;
alter table GROUPS add unique (GROUP_UID);
Modified: CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_tables.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_tables.py 2015-03-13 18:44:00 UTC (rev 14588)
+++ CalendarServer/branches/release/CalendarServer-6.1-dev/txdav/common/datastore/sql_tables.py 2015-03-13 19:22:11 UTC (rev 14589)
@@ -424,7 +424,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/20150313/bf85e168/attachment-0001.html>
More information about the calendarserver-changes
mailing list