From 05badd4d3a95d0b231208753acb66d6d8f3793ef Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Thu, 25 Aug 2011 15:05:28 +1200
Subject: [PATCH] New SQL patch file, and fix comment in the last one also.

---
 dba/patches/1.2.10.sql | 68 ++++++++++++++++++++++++++++++++++++++++++
 dba/patches/1.2.9.sql  |  6 ++--
 2 files changed, 70 insertions(+), 4 deletions(-)
 create mode 100644 dba/patches/1.2.10.sql

diff --git a/dba/patches/1.2.10.sql b/dba/patches/1.2.10.sql
new file mode 100644
index 00000000..066e3b4e
--- /dev/null
+++ b/dba/patches/1.2.10.sql
@@ -0,0 +1,68 @@
+
+-- Minor fix:			Ensure the target of a binding is unique
+-- Minor enhancement:	Add columns for earliest start / latest end for improved pre-selection
+--                      Add columns to support remote binds
+
+-- Just in case these constraints got added manually, so we won't fail
+-- if there is an existing one.
+ALTER TABLE principal DROP CONSTRAINT unique_user CASCADE;
+ALTER TABLE collection DROP CONSTRAINT unique_path CASCADE;
+
+CREATE or REPLACE FUNCTION real_path_exists( TEXT ) RETURNS BOOLEAN AS $$
+DECLARE
+  in_path ALIAS FOR $1;
+  tmp BOOLEAN;
+BEGIN
+  IF in_path = '/' THEN
+    RETURN TRUE;
+  END IF;
+  IF in_path ~ '^/[^/]+/$' THEN
+    SELECT TRUE INTO tmp FROM usr WHERE username = substring( in_path from 2 for length(in_path) - 2);
+    IF FOUND THEN
+      RETURN TRUE;
+    END IF;
+  ELSE
+    IF in_path ~ '^/.*/$' THEN
+      SELECT TRUE INTO tmp FROM collection WHERE dav_name = in_path;
+      IF FOUND THEN
+        RETURN TRUE;
+      END IF;
+    END IF;
+  END IF;
+  RETURN FALSE;
+END;
+$$ LANGUAGE plpgsql ;
+        
+BEGIN;
+SELECT check_db_revision(1,2,9);
+
+ALTER TABLE dav_binding ADD UNIQUE( dav_name );
+
+-- New fields for Rob Ostensen's remote binding setup
+ALTER TABLE dav_binding ADD COLUMN external_url TEXT;
+ALTER TABLE dav_binding ADD COLUMN type TEXT;
+
+ALTER TABLE principal ADD CONSTRAINT unique_user UNIQUE (user_no);
+
+-- Ensure we don't refer to any newer, duplicated collections
+UPDATE caldav_data SET collection_id = (SELECT min(c2.collection_id) FROM collection c1, collection c2
+                                         WHERE c1.dav_name = c2.dav_name AND c1.collection_id = caldav_data.collection_id)
+        WHERE collection_id > (SELECT min(c2.collection_id) FROM collection c1, collection c2
+                                WHERE c1.dav_name = c2.dav_name AND c1.collection_id = caldav_data.collection_id);
+-- Ensure the newer duplicated collections don't exist any longer
+DELETE FROM collection WHERE collection_id > (SELECT min(collection_id) FROM collection c2 WHERE c2.dav_name = collection.dav_name);
+-- Ensure we can't add more duplicates in the future
+ALTER TABLE collection ADD CONSTRAINT unique_path UNIQUE (dav_name);
+
+ALTER TABLE dav_binding ADD CONSTRAINT "dav_name_does_not_exist"
+		CHECK (NOT real_path_exists(dav_name));
+
+-- We will use these to improve our selection criteria in future, but for now we will leave them null
+ALTER TABLE calendar_item ADD COLUMN first_instance_start TIMESTAMP WITHOUT TIME ZONE DEFAULT NULL;
+ALTER TABLE calendar_item ADD COLUMN last_instance_end    TIMESTAMP WITHOUT TIME ZONE DEFAULT NULL;
+
+SELECT new_db_revision(1,2,10, 'Octobre' );
+
+COMMIT;
+ROLLBACK;
+
diff --git a/dba/patches/1.2.9.sql b/dba/patches/1.2.9.sql
index f744a32a..5b14351b 100644
--- a/dba/patches/1.2.9.sql
+++ b/dba/patches/1.2.9.sql
@@ -1,8 +1,6 @@
 
--- This database update adds support for tickets to be handed out to grant
--- specific access to a collection or individual resource, as read-only or
--- read-write.  A table is also added to manage WebDAV binding, in line
--- with http://tools.ietf.org/html/draft-ietf-webdav-bind.
+-- This database update adds some extra columns / tables for tracking
+-- alarms, attendee states and addressbook address field expansion.
 
 BEGIN;
 SELECT check_db_revision(1,2,8);