From 58356fb3e322dc87c43f3f8200beb9d8c490737f Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Thu, 18 Mar 2010 19:57:14 +1300 Subject: [PATCH] Remove the mashup tables which we will do more sensibly. --- dba/davical.sql | 17 ----------------- dba/patches/1.2.8.sql | 17 ----------------- 2 files changed, 34 deletions(-) diff --git a/dba/davical.sql b/dba/davical.sql index 9c369c69..69541c4d 100644 --- a/dba/davical.sql +++ b/dba/davical.sql @@ -326,23 +326,6 @@ CREATE TABLE dav_binding ( ); -CREATE TABLE collection_mashup ( - mashup_id SERIAL PRIMARY KEY, - dav_owner_id INT8 NOT NULL REFERENCES principal(principal_id) ON UPDATE CASCADE ON DELETE CASCADE, - parent_container TEXT NOT NULL, - dav_name TEXT UNIQUE NOT NULL, - dav_displayname TEXT -); - - -CREATE TABLE mashup_member ( - mashup_id INT8 NOT NULL REFERENCES collection_mashup(mashup_id) ON UPDATE CASCADE ON DELETE CASCADE, - target_collection_id INT8 REFERENCES collection(collection_id) ON UPDATE CASCADE ON DELETE CASCADE, - target_ticket_id TEXT REFERENCES access_ticket(ticket_id) ON UPDATE CASCADE ON DELETE SET NULL, - member_colour TEXT -); - - CREATE TABLE addressbook_resource ( dav_id INT8 NOT NULL REFERENCES caldav_data(dav_id) ON UPDATE CASCADE ON DELETE CASCADE PRIMARY KEY, version TEXT, diff --git a/dba/patches/1.2.8.sql b/dba/patches/1.2.8.sql index 9a9b6926..c9c49d92 100644 --- a/dba/patches/1.2.8.sql +++ b/dba/patches/1.2.8.sql @@ -31,23 +31,6 @@ CREATE TABLE dav_binding ( ); -CREATE TABLE collection_mashup ( - mashup_id SERIAL PRIMARY KEY, - dav_owner_id INT8 NOT NULL REFERENCES principal(principal_id) ON UPDATE CASCADE ON DELETE CASCADE, - parent_container TEXT NOT NULL, - dav_name TEXT UNIQUE NOT NULL, - dav_displayname TEXT -); - - -CREATE TABLE mashup_member ( - mashup_id INT8 NOT NULL REFERENCES collection_mashup(mashup_id) ON UPDATE CASCADE ON DELETE CASCADE, - target_collection_id INT8 REFERENCES collection(collection_id) ON UPDATE CASCADE ON DELETE CASCADE, - target_ticket_id TEXT REFERENCES access_ticket(ticket_id) ON UPDATE CASCADE ON DELETE SET NULL, - member_colour TEXT -); - - CREATE TABLE addressbook_resource ( dav_id INT8 NOT NULL REFERENCES caldav_data(dav_id) ON UPDATE CASCADE ON DELETE CASCADE PRIMARY KEY, version TEXT,