[CalendarServer-changes] [8117] CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/ oracle-dialect/upgrade_from_4_to_5.sql

[source_changes at macosforge.org]

Revision: 8117
          http://trac.macosforge.org/projects/calendarserver/changeset/8117
Author:   cdaboo at apple.com
Date:     2011-09-23 13:39:30 -0700 (Fri, 23 Sep 2011)
Log Message:
-----------
Fix more Oracle upgrade errors.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_4_to_5.sql

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_4_to_5.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_4_to_5.sql	2011-09-23 19:13:08 UTC (rev 8116)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_4_to_5.sql	2011-09-23 20:39:30 UTC (rev 8117)
@@ -49,7 +49,7 @@
 alter index IDX_23_ADDRESSBOOK_OBJECT_ADDR rename to ADDRESSBOOK_OBJECT_AD_1540450d;
 alter index IDX_24_CALENDAR_OBJECT_REVISIO rename to CALENDAR_OBJECT_REVIS_42be4d9e;
 alter index IDX_25_CALENDAR_OBJECT_REVISIO rename to CALENDAR_OBJECT_REVIS_3e41b7f0;
-alter index IDX_26_ADDRESSBOOK_OBJECT_REVI rename to ADDRESSBOOK_OBJECT_RE_5965a9e2
+alter index IDX_26_ADDRESSBOOK_OBJECT_REVI rename to ADDRESSBOOK_OBJECT_RE_5965a9e2;
 alter index IDX_27_ADDRESSBOOK_OBJECT_REVI rename to ADDRESSBOOK_OBJECT_RE_2ab44f33;
 alter index IDX_28_NOTIFICATION_OBJECT_REV rename to NOTIFICATION_OBJECT_R_47002cd8;
 
@@ -76,8 +76,10 @@
 drop index CALENDAR_OBJECT_CALEN_06694fd0;
 
 drop index ATTACHMENT_DROPBOX_ID_5073cf23;
+-- This constraint was not properly translated in original v4 schema
+--alter table ATTACHMENT 
+-- drop unique(DROPBOX_ID, PATH);
 alter table ATTACHMENT
- drop unique(DROPBOX_ID, PATH),
  add primary key(DROPBOX_ID, PATH);
 create index ATTACHMENT_CALENDAR_H_0078845c on
   ATTACHMENT(CALENDAR_HOME_RESOURCE_ID);
@@ -99,7 +101,8 @@
 drop index NOTIFICATION_OBJECT_R_47002cd8;
 
 alter table CALENDARSERVER
- drop unique(NAME),
+ drop unique(NAME);
+alter table CALENDARSERVER
  add primary key(NAME);
 
 -- Changes to restore multi-column primary key and uniques lost in translation of v4
@@ -108,7 +111,8 @@
  add unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID);
  
 alter table CALENDAR_BIND
- add primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID),
+ add primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID);
+alter table CALENDAR_BIND
  add unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME);
  
 alter table CALENDAR_OBJECT
@@ -121,17 +125,19 @@
  add primary key(RESOURCE_ID, NAME, VIEWER_UID);
  
 alter table ADDRESSBOOK_BIND
- add primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID),
+ add primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID);
+alter table ADDRESSBOOK_BIND
  add unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME);
  
 alter table ADDRESSBOOK_OBJECT
- add unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME),
+ add unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME);
+alter table ADDRESSBOOK_OBJECT
  add unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID);
  
 alter table CALENDAR_OBJECT_REVISIONS
  add unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME);
  
-alter table CALENDAR_OBJECT_REVISIONS
+alter table ADDRESSBOOK_OBJECT_REVISIONS
  add unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME);
  
 alter table NOTIFICATION_OBJECT_REVISIONS
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110923/faefcd7c/attachment-0001.html>