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

[source_changes at macosforge.org]

Revision: 11774
          http://trac.calendarserver.org//changeset/11774
Author:   dre at apple.com
Date:     2013-10-01 14:20:36 -0700 (Tue, 01 Oct 2013)
Log Message:
-----------
Clean up 19 to 20 oracle schema upgrade; cascade constraints on drop column ADDRESSBOOK_RESOURCE_ID

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

Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_19_to_20.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_19_to_20.sql	2013-10-01 19:11:51 UTC (rev 11773)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_19_to_20.sql	2013-10-01 21:20:36 UTC (rev 11774)
@@ -176,10 +176,11 @@
   	
 -- add non null constraints after update and delete are complete
 alter table ADDRESSBOOK_OBJECT
-	modify ("KIND" not null,
-            "ADDRESSBOOK_HOME_RESOURCE_ID" not null)
-	drop ("ADDRESSBOOK_RESOURCE_ID");
+        modify ("KIND" not null)
+        modify ("ADDRESSBOOK_HOME_RESOURCE_ID" not null);
 
+alter table ADDRESSBOOK_OBJECT
+        drop column ADDRESSBOOK_RESOURCE_ID cascade constraints;
 
 alter table ADDRESSBOOK_OBJECT
 	add unique ("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20131001/1a5be517/attachment.html>