From 0bd0fbca853bd67aae8f959ccd650f58cf682bb6 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Tue, 27 Oct 2009 17:31:22 +1300 Subject: [PATCH] Bugfix database definitions / patches after last change. --- dba/davical.sql | 5 +++-- dba/patches/1.2.6.sql | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dba/davical.sql b/dba/davical.sql index b3795859..e5173184 100644 --- a/dba/davical.sql +++ b/dba/davical.sql @@ -280,9 +280,10 @@ CREATE TABLE grants ( by_collection INT8 REFERENCES collection(collection_id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE, to_principal INT8 REFERENCES principal(principal_id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE, privileges BIT(24), - is_group BOOLEAN, - PRIMARY KEY (dav_name, to_principal) + is_group BOOLEAN ) WITHOUT OIDS; +CREATE UNIQUE INDEX grants_pk1 ON grants(by_principal,to_principal); +CREATE UNIQUE INDEX grants_pk2 ON grants(by_collection,to_principal); CREATE TABLE sync_tokens ( diff --git a/dba/patches/1.2.6.sql b/dba/patches/1.2.6.sql index 5d4e1c13..b37258d5 100644 --- a/dba/patches/1.2.6.sql +++ b/dba/patches/1.2.6.sql @@ -548,9 +548,10 @@ CREATE TABLE grants ( by_collection INT8 REFERENCES collection(collection_id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE, to_principal INT8 REFERENCES principal(principal_id) ON UPDATE CASCADE ON DELETE CASCADE DEFERRABLE, privileges BIT(24), - is_group BOOLEAN, - PRIMARY KEY (dav_name, to_principal) + is_group BOOLEAN ) WITHOUT OIDS; +CREATE UNIQUE INDEX grants_pk1 ON grants(by_principal,to_principal); +CREATE UNIQUE INDEX grants_pk2 ON grants(by_collection,to_principal); INSERT INTO grants ( by_principal, to_principal, privileges, is_group )