[CalendarServer-changes] [8107] CalendarServer/trunk/txdav/common/datastore
source_changes at macosforge.org
source_changes at macosforge.org
Tue Sep 20 08:50:55 PDT 2011
Revision: 8107
http://trac.macosforge.org/projects/calendarserver/changeset/8107
Author: cdaboo at apple.com
Date: 2011-09-20 08:50:54 -0700 (Tue, 20 Sep 2011)
Log Message:
-----------
Schema upgrade to v5. Added a new test to do "live" database schema upgrade checks for all old versions.
Modified Paths:
--------------
CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql
CalendarServer/trunk/txdav/common/datastore/test/test_util.py
CalendarServer/trunk/txdav/common/datastore/util.py
Added Paths:
-----------
CalendarServer/trunk/txdav/common/datastore/sql_schema/old/v4.sql
CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_4_to_5.sql
CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_4_to_5.sql
Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql 2011-09-19 20:02:17 UTC (rev 8106)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql 2011-09-20 15:50:54 UTC (rev 8107)
@@ -28,30 +28,25 @@
-------------------
create table CALENDAR_HOME (
- RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'),
- OWNER_UID varchar(255) not null unique
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
+ OWNER_UID varchar(255) not null unique -- implicit index
);
-create index CALENDAR_HOME_OWNER_UID on CALENDAR_HOME(OWNER_UID);
-
----------------------------
-- Calendar Home Metadata --
----------------------------
create table CALENDAR_HOME_METADATA (
- RESOURCE_ID integer not null references CALENDAR_HOME on delete cascade,
+ RESOURCE_ID integer primary key references CALENDAR_HOME on delete cascade, -- implicit index
QUOTA_USED_BYTES integer default 0 not null
);
-create index CALENDAR_HOME_METADATA_RESOURCE_ID
- on CALENDAR_HOME_METADATA(RESOURCE_ID);
-
--------------
-- Calendar --
--------------
create table CALENDAR (
- RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'),
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP)
);
@@ -67,26 +62,25 @@
RECIPIENT_ADDRESS varchar(255) not null,
HOME_RESOURCE_ID integer not null,
RESOURCE_ID integer not null
+
+ -- Need primary key on (INVITE_UID, NAME, RECIPIENT_ADDRESS)?
);
create index INVITE_INVITE_UID on INVITE(INVITE_UID);
-create index INVITE_RESOURCE_ID on INVITE(INVITE_UID);
-create index INVITE_HOME_RESOURCE_ID on INVITE(INVITE_UID);
+create index INVITE_RESOURCE_ID on INVITE(RESOURCE_ID);
+create index INVITE_HOME_RESOURCE_ID on INVITE(HOME_RESOURCE_ID);
---------------------------
-- Sharing Notifications --
---------------------------
create table NOTIFICATION_HOME (
- RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'),
- OWNER_UID varchar(255) not null unique
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
+ OWNER_UID varchar(255) not null unique -- implicit index
);
-create index NOTIFICATION_HOME_OWNER_UID on NOTIFICATION_HOME(OWNER_UID);
-
-
create table NOTIFICATION (
- RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'),
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
NOTIFICATION_HOME_RESOURCE_ID integer not null references NOTIFICATION_HOME,
NOTIFICATION_UID varchar(255) not null,
XML_TYPE varchar(255) not null,
@@ -95,14 +89,12 @@
CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
- unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID)
+ unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID) -- implicit index
);
create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
NOTIFICATION(NOTIFICATION_HOME_RESOURCE_ID);
-create index NOTIFICATION_NOTIFICATION_UID on NOTIFICATION(NOTIFICATION_UID);
-
-------------------
-- Calendar Bind --
-------------------
@@ -123,14 +115,11 @@
SEEN_BY_SHAREE boolean not null,
MESSAGE text,
- primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID),
- unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)
+ primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID), -- implicit index
+ unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME) -- implicit index
);
-create index CALENDAR_BIND_HOME_RESOURCE_ID on
- CALENDAR_BIND(CALENDAR_HOME_RESOURCE_ID);
-create index CALENDAR_BIND_RESOURCE_ID on
- CALENDAR_BIND(CALENDAR_RESOURCE_ID);
+create index CALENDAR_BIND_RESOURCE_ID on CALENDAR_BIND(CALENDAR_RESOURCE_ID);
-- Enumeration of calendar bind modes
@@ -162,7 +151,7 @@
---------------------
create table CALENDAR_OBJECT (
- RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'),
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
CALENDAR_RESOURCE_ID integer not null references CALENDAR on delete cascade,
RESOURCE_NAME varchar(255) not null,
ICALENDAR_TEXT text not null,
@@ -182,7 +171,7 @@
CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
- unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME)
+ unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
-- since the 'inbox' is a 'calendar resource' for the purpose of storing
-- calendar objects, this constraint has to be selectively enforced by the
@@ -191,9 +180,6 @@
-- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
);
-create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID on
- CALENDAR_OBJECT(CALENDAR_RESOURCE_ID);
-
create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
CALENDAR_OBJECT(CALENDAR_RESOURCE_ID, ICALENDAR_UID);
@@ -243,7 +229,7 @@
----------------
create table TIME_RANGE (
- INSTANCE_ID integer primary key default nextval('INSTANCE_ID_SEQ'),
+ INSTANCE_ID integer primary key default nextval('INSTANCE_ID_SEQ'), -- implicit index
CALENDAR_RESOURCE_ID integer not null references CALENDAR on delete cascade,
CALENDAR_OBJECT_RESOURCE_ID integer not null references CALENDAR_OBJECT on delete cascade,
FLOATING boolean not null,
@@ -300,12 +286,12 @@
MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
PATH varchar(1024) not null,
- unique(DROPBOX_ID, PATH)
+ primary key(DROPBOX_ID, PATH) --implicit index
);
-create index ATTACHMENT_DROPBOX_ID on ATTACHMENT(DROPBOX_ID);
+create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
+ ATTACHMENT(CALENDAR_HOME_RESOURCE_ID);
-
-----------------------
-- Resource Property --
-----------------------
@@ -316,7 +302,7 @@
VALUE text not null, -- FIXME: xml?
VIEWER_UID varchar(255),
- primary key(RESOURCE_ID, NAME, VIEWER_UID)
+ primary key(RESOURCE_ID, NAME, VIEWER_UID) -- implicit index
);
@@ -325,30 +311,25 @@
----------------------
create table ADDRESSBOOK_HOME (
- RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'),
- OWNER_UID varchar(255) not null unique
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
+ OWNER_UID varchar(255) not null unique -- implicit index
);
-create index ADDRESSBOOK_HOME_OWNER_UID on ADDRESSBOOK_HOME(OWNER_UID);
-
--------------------------------
-- AddressBook Home Meta-data --
--------------------------------
create table ADDRESSBOOK_HOME_METADATA (
- RESOURCE_ID integer not null references ADDRESSBOOK_HOME on delete cascade,
+ RESOURCE_ID integer primary key references ADDRESSBOOK_HOME on delete cascade, -- implicit index
QUOTA_USED_BYTES integer default 0 not null
);
-create index ADDRESSBOOK_HOME_METADATA_RESOURCE_ID
- on ADDRESSBOOK_HOME_METADATA(RESOURCE_ID);
-
-----------------
-- AddressBook --
-----------------
create table ADDRESSBOOK (
- RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'),
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP)
);
@@ -374,17 +355,15 @@
SEEN_BY_SHAREE boolean not null,
MESSAGE text, -- FIXME: xml?
- primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID),
- unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)
+ primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+ unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
);
-create index ADDRESSBOOK_BIND_HOME_RESOURCE_ID on
- ADDRESSBOOK_BIND(ADDRESSBOOK_HOME_RESOURCE_ID);
create index ADDRESSBOOK_BIND_RESOURCE_ID on
ADDRESSBOOK_BIND(ADDRESSBOOK_RESOURCE_ID);
create table ADDRESSBOOK_OBJECT (
- RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'),
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
ADDRESSBOOK_RESOURCE_ID integer not null references ADDRESSBOOK on delete cascade,
RESOURCE_NAME varchar(255) not null,
VCARD_TEXT text not null,
@@ -393,13 +372,10 @@
CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
- unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME),
- unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID)
+ unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+ unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
);
-create index ADDRESSBOOK_OBJECT_ADDRESSBOOK_RESOURCE_ID on
- ADDRESSBOOK_OBJECT(ADDRESSBOOK_RESOURCE_ID);
-
---------------
-- Revisions --
---------------
@@ -419,17 +395,14 @@
REVISION integer default nextval('REVISION_SEQ') not null,
DELETED boolean not null,
- unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME)
+ unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME) -- implicit index
);
create index CALENDAR_OBJECT_REVISIONS_HOME_RESOURCE_ID
on CALENDAR_OBJECT_REVISIONS(CALENDAR_HOME_RESOURCE_ID);
-create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID
- on CALENDAR_OBJECT_REVISIONS(CALENDAR_RESOURCE_ID);
-
-------------------------------
-- AddressBook Object Revisions --
-------------------------------
@@ -442,15 +415,12 @@
REVISION integer default nextval('REVISION_SEQ') not null,
DELETED boolean not null,
- unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME)
+ unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME) -- implicit index
);
create index ADDRESSBOOK_OBJECT_REVISIONS_HOME_RESOURCE_ID
on ADDRESSBOOK_OBJECT_REVISIONS(ADDRESSBOOK_HOME_RESOURCE_ID);
-create index ADDRESSBOOK_OBJECT_REVISIONS_RESOURCE_ID
- on ADDRESSBOOK_OBJECT_REVISIONS(ADDRESSBOOK_RESOURCE_ID);
-
-----------------------------------
-- Notification Object Revisions --
-----------------------------------
@@ -461,23 +431,18 @@
REVISION integer default nextval('REVISION_SEQ') not null,
DELETED boolean not null,
- unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME)
+ unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME) -- implicit index
);
-create index NOTIFICATION_OBJECT_REVISIONS_HOME_RESOURCE_ID
- on NOTIFICATION_OBJECT_REVISIONS(NOTIFICATION_HOME_RESOURCE_ID);
-
-
--------------------
-- Schema Version --
--------------------
create table CALENDARSERVER (
- NAME varchar(255),
- VALUE varchar(255),
- unique(NAME)
+ NAME varchar(255) primary key, -- implicit index
+ VALUE varchar(255)
);
-insert into CALENDARSERVER values ('VERSION', '4');
+insert into CALENDARSERVER values ('VERSION', '5');
Added: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/v4.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/v4.sql (rev 0)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/v4.sql 2011-09-20 15:50:54 UTC (rev 8107)
@@ -0,0 +1,483 @@
+-- -*- test-case-name: txdav.caldav.datastore.test.test_sql,txdav.carddav.datastore.test.test_sql -*-
+
+----
+-- Copyright (c) 2010-2011 Apple Inc. All rights reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+----
+
+-----------------
+-- Resource ID --
+-----------------
+
+create sequence RESOURCE_ID_SEQ;
+
+
+-------------------
+-- Calendar Home --
+-------------------
+
+create table CALENDAR_HOME (
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'),
+ OWNER_UID varchar(255) not null unique
+);
+
+create index CALENDAR_HOME_OWNER_UID on CALENDAR_HOME(OWNER_UID);
+
+----------------------------
+-- Calendar Home Metadata --
+----------------------------
+
+create table CALENDAR_HOME_METADATA (
+ RESOURCE_ID integer not null references CALENDAR_HOME on delete cascade,
+ QUOTA_USED_BYTES integer default 0 not null
+);
+
+create index CALENDAR_HOME_METADATA_RESOURCE_ID
+ on CALENDAR_HOME_METADATA(RESOURCE_ID);
+
+--------------
+-- Calendar --
+--------------
+
+create table CALENDAR (
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'),
+ CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP)
+);
+
+
+------------------------
+-- Sharing Invitation --
+------------------------
+
+create table INVITE (
+ INVITE_UID varchar(255) not null,
+ NAME varchar(255) not null,
+ RECIPIENT_ADDRESS varchar(255) not null,
+ HOME_RESOURCE_ID integer not null,
+ RESOURCE_ID integer not null
+);
+
+create index INVITE_INVITE_UID on INVITE(INVITE_UID);
+create index INVITE_RESOURCE_ID on INVITE(INVITE_UID);
+create index INVITE_HOME_RESOURCE_ID on INVITE(INVITE_UID);
+
+---------------------------
+-- Sharing Notifications --
+---------------------------
+
+create table NOTIFICATION_HOME (
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'),
+ OWNER_UID varchar(255) not null unique
+);
+
+create index NOTIFICATION_HOME_OWNER_UID on NOTIFICATION_HOME(OWNER_UID);
+
+
+create table NOTIFICATION (
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'),
+ NOTIFICATION_HOME_RESOURCE_ID integer not null references NOTIFICATION_HOME,
+ NOTIFICATION_UID varchar(255) not null,
+ XML_TYPE varchar(255) not null,
+ XML_DATA text not null,
+ MD5 char(32) not null,
+ CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+
+ unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID)
+);
+
+create index NOTIFICATION_NOTIFICATION_HOME_RESOURCE_ID on
+ NOTIFICATION(NOTIFICATION_HOME_RESOURCE_ID);
+
+create index NOTIFICATION_NOTIFICATION_UID on NOTIFICATION(NOTIFICATION_UID);
+
+-------------------
+-- Calendar Bind --
+-------------------
+
+-- Joins CALENDAR_HOME and CALENDAR
+
+create table CALENDAR_BIND (
+ CALENDAR_HOME_RESOURCE_ID integer not null references CALENDAR_HOME,
+ CALENDAR_RESOURCE_ID integer not null references CALENDAR on delete cascade,
+
+ -- An invitation which hasn't been accepted yet will not yet have a resource
+ -- name, so this field may be null.
+
+ CALENDAR_RESOURCE_NAME varchar(255),
+ BIND_MODE integer not null, -- enum CALENDAR_BIND_MODE
+ BIND_STATUS integer not null, -- enum CALENDAR_BIND_STATUS
+ SEEN_BY_OWNER boolean not null,
+ SEEN_BY_SHAREE boolean not null,
+ MESSAGE text,
+
+ primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID),
+ unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME)
+);
+
+create index CALENDAR_BIND_HOME_RESOURCE_ID on
+ CALENDAR_BIND(CALENDAR_HOME_RESOURCE_ID);
+create index CALENDAR_BIND_RESOURCE_ID on
+ CALENDAR_BIND(CALENDAR_RESOURCE_ID);
+
+-- Enumeration of calendar bind modes
+
+create table CALENDAR_BIND_MODE (
+ ID integer primary key,
+ DESCRIPTION varchar(16) not null unique
+);
+
+insert into CALENDAR_BIND_MODE values (0, 'own' );
+insert into CALENDAR_BIND_MODE values (1, 'read' );
+insert into CALENDAR_BIND_MODE values (2, 'write');
+insert into CALENDAR_BIND_MODE values (3, 'direct');
+
+-- Enumeration of statuses
+
+create table CALENDAR_BIND_STATUS (
+ ID integer primary key,
+ DESCRIPTION varchar(16) not null unique
+);
+
+insert into CALENDAR_BIND_STATUS values (0, 'invited' );
+insert into CALENDAR_BIND_STATUS values (1, 'accepted');
+insert into CALENDAR_BIND_STATUS values (2, 'declined');
+insert into CALENDAR_BIND_STATUS values (3, 'invalid');
+
+
+---------------------
+-- Calendar Object --
+---------------------
+
+create table CALENDAR_OBJECT (
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'),
+ CALENDAR_RESOURCE_ID integer not null references CALENDAR on delete cascade,
+ RESOURCE_NAME varchar(255) not null,
+ ICALENDAR_TEXT text not null,
+ ICALENDAR_UID varchar(255) not null,
+ ICALENDAR_TYPE varchar(255) not null,
+ ATTACHMENTS_MODE integer default 0 not null, -- enum CALENDAR_OBJECT_ATTACHMENTS_MODE
+ DROPBOX_ID varchar(255),
+ ORGANIZER varchar(255),
+ ORGANIZER_OBJECT integer references CALENDAR_OBJECT,
+ RECURRANCE_MAX date, -- maximum date that recurrences have been expanded to.
+ ACCESS integer default 0 not null,
+ SCHEDULE_OBJECT boolean default false,
+ SCHEDULE_TAG varchar(36) default null,
+ SCHEDULE_ETAGS text default null,
+ PRIVATE_COMMENTS boolean default false not null,
+ MD5 char(32) not null,
+ CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+
+ unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME)
+
+ -- since the 'inbox' is a 'calendar resource' for the purpose of storing
+ -- calendar objects, this constraint has to be selectively enforced by the
+ -- application layer.
+
+ -- unique(CALENDAR_RESOURCE_ID, ICALENDAR_UID)
+);
+
+create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID on
+ CALENDAR_OBJECT(CALENDAR_RESOURCE_ID);
+
+create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_AND_ICALENDAR_UID on
+ CALENDAR_OBJECT(CALENDAR_RESOURCE_ID, ICALENDAR_UID);
+
+create index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID_RECURRANCE_MAX on
+ CALENDAR_OBJECT(CALENDAR_RESOURCE_ID, RECURRANCE_MAX);
+
+create index CALENDAR_OBJECT_ORGANIZER_OBJECT on
+ CALENDAR_OBJECT(ORGANIZER_OBJECT);
+
+create index CALENDAR_OBJECT_DROPBOX_ID on
+ CALENDAR_OBJECT(DROPBOX_ID);
+
+-- Enumeration of attachment modes
+
+create table CALENDAR_OBJECT_ATTACHMENTS_MODE (
+ ID integer primary key,
+ DESCRIPTION varchar(16) not null unique
+);
+
+insert into CALENDAR_OBJECT_ATTACHMENTS_MODE values (0, 'none' );
+insert into CALENDAR_OBJECT_ATTACHMENTS_MODE values (1, 'read' );
+insert into CALENDAR_OBJECT_ATTACHMENTS_MODE values (2, 'write');
+
+
+-- Enumeration of calendar access types
+
+create table CALENDAR_ACCESS_TYPE (
+ ID integer primary key,
+ DESCRIPTION varchar(32) not null unique
+);
+
+insert into CALENDAR_ACCESS_TYPE values (0, '' );
+insert into CALENDAR_ACCESS_TYPE values (1, 'public' );
+insert into CALENDAR_ACCESS_TYPE values (2, 'private' );
+insert into CALENDAR_ACCESS_TYPE values (3, 'confidential' );
+insert into CALENDAR_ACCESS_TYPE values (4, 'restricted' );
+
+-----------------
+-- Instance ID --
+-----------------
+
+create sequence INSTANCE_ID_SEQ;
+
+
+----------------
+-- Time Range --
+----------------
+
+create table TIME_RANGE (
+ INSTANCE_ID integer primary key default nextval('INSTANCE_ID_SEQ'),
+ CALENDAR_RESOURCE_ID integer not null references CALENDAR on delete cascade,
+ CALENDAR_OBJECT_RESOURCE_ID integer not null references CALENDAR_OBJECT on delete cascade,
+ FLOATING boolean not null,
+ START_DATE timestamp not null,
+ END_DATE timestamp not null,
+ FBTYPE integer not null,
+ TRANSPARENT boolean not null
+);
+
+create index TIME_RANGE_CALENDAR_RESOURCE_ID on
+ TIME_RANGE(CALENDAR_RESOURCE_ID);
+create index TIME_RANGE_CALENDAR_OBJECT_RESOURCE_ID on
+ TIME_RANGE(CALENDAR_OBJECT_RESOURCE_ID);
+
+
+-- Enumeration of free/busy types
+
+create table FREE_BUSY_TYPE (
+ ID integer primary key,
+ DESCRIPTION varchar(16) not null unique
+);
+
+insert into FREE_BUSY_TYPE values (0, 'unknown' );
+insert into FREE_BUSY_TYPE values (1, 'free' );
+insert into FREE_BUSY_TYPE values (2, 'busy' );
+insert into FREE_BUSY_TYPE values (3, 'busy-unavailable');
+insert into FREE_BUSY_TYPE values (4, 'busy-tentative' );
+
+
+------------------
+-- Transparency --
+------------------
+
+create table TRANSPARENCY (
+ TIME_RANGE_INSTANCE_ID integer not null references TIME_RANGE on delete cascade,
+ USER_ID varchar(255) not null,
+ TRANSPARENT boolean not null
+);
+
+create index TRANSPARENCY_TIME_RANGE_INSTANCE_ID on
+ TRANSPARENCY(TIME_RANGE_INSTANCE_ID);
+
+----------------
+-- Attachment --
+----------------
+
+create table ATTACHMENT (
+ CALENDAR_HOME_RESOURCE_ID integer not null references CALENDAR_HOME,
+ DROPBOX_ID varchar(255) not null,
+ CONTENT_TYPE varchar(255) not null,
+ SIZE integer not null,
+ MD5 char(32) not null,
+ CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ PATH varchar(1024) not null,
+
+ unique(DROPBOX_ID, PATH)
+);
+
+create index ATTACHMENT_DROPBOX_ID on ATTACHMENT(DROPBOX_ID);
+
+
+-----------------------
+-- Resource Property --
+-----------------------
+
+create table RESOURCE_PROPERTY (
+ RESOURCE_ID integer not null, -- foreign key: *.RESOURCE_ID
+ NAME varchar(255) not null,
+ VALUE text not null, -- FIXME: xml?
+ VIEWER_UID varchar(255),
+
+ primary key(RESOURCE_ID, NAME, VIEWER_UID)
+);
+
+
+----------------------
+-- AddressBook Home --
+----------------------
+
+create table ADDRESSBOOK_HOME (
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'),
+ OWNER_UID varchar(255) not null unique
+);
+
+create index ADDRESSBOOK_HOME_OWNER_UID on ADDRESSBOOK_HOME(OWNER_UID);
+
+--------------------------------
+-- AddressBook Home Meta-data --
+--------------------------------
+
+create table ADDRESSBOOK_HOME_METADATA (
+ RESOURCE_ID integer not null references ADDRESSBOOK_HOME on delete cascade,
+ QUOTA_USED_BYTES integer default 0 not null
+);
+
+create index ADDRESSBOOK_HOME_METADATA_RESOURCE_ID
+ on ADDRESSBOOK_HOME_METADATA(RESOURCE_ID);
+
+-----------------
+-- AddressBook --
+-----------------
+
+create table ADDRESSBOOK (
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'),
+ CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP)
+);
+
+
+----------------------
+-- AddressBook Bind --
+----------------------
+
+-- Joins ADDRESSBOOK_HOME and ADDRESSBOOK
+
+create table ADDRESSBOOK_BIND (
+ ADDRESSBOOK_HOME_RESOURCE_ID integer not null references ADDRESSBOOK_HOME,
+ ADDRESSBOOK_RESOURCE_ID integer not null references ADDRESSBOOK on delete cascade,
+
+ -- An invitation which hasn't been accepted yet will not yet have a resource
+ -- name, so this field may be null.
+
+ ADDRESSBOOK_RESOURCE_NAME varchar(255),
+ BIND_MODE integer not null, -- enum CALENDAR_BIND_MODE
+ BIND_STATUS integer not null, -- enum CALENDAR_BIND_STATUS
+ SEEN_BY_OWNER boolean not null,
+ SEEN_BY_SHAREE boolean not null,
+ MESSAGE text, -- FIXME: xml?
+
+ primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID),
+ unique(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME)
+);
+
+create index ADDRESSBOOK_BIND_HOME_RESOURCE_ID on
+ ADDRESSBOOK_BIND(ADDRESSBOOK_HOME_RESOURCE_ID);
+create index ADDRESSBOOK_BIND_RESOURCE_ID on
+ ADDRESSBOOK_BIND(ADDRESSBOOK_RESOURCE_ID);
+
+create table ADDRESSBOOK_OBJECT (
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'),
+ ADDRESSBOOK_RESOURCE_ID integer not null references ADDRESSBOOK on delete cascade,
+ RESOURCE_NAME varchar(255) not null,
+ VCARD_TEXT text not null,
+ VCARD_UID varchar(255) not null,
+ MD5 char(32) not null,
+ CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+
+ unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME),
+ unique(ADDRESSBOOK_RESOURCE_ID, VCARD_UID)
+);
+
+create index ADDRESSBOOK_OBJECT_ADDRESSBOOK_RESOURCE_ID on
+ ADDRESSBOOK_OBJECT(ADDRESSBOOK_RESOURCE_ID);
+
+---------------
+-- Revisions --
+---------------
+
+create sequence REVISION_SEQ;
+
+
+---------------
+-- Revisions --
+---------------
+
+create table CALENDAR_OBJECT_REVISIONS (
+ CALENDAR_HOME_RESOURCE_ID integer not null references CALENDAR_HOME,
+ CALENDAR_RESOURCE_ID integer references CALENDAR,
+ CALENDAR_NAME varchar(255) default null,
+ RESOURCE_NAME varchar(255),
+ REVISION integer default nextval('REVISION_SEQ') not null,
+ DELETED boolean not null,
+
+ unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME)
+);
+
+
+create index CALENDAR_OBJECT_REVISIONS_HOME_RESOURCE_ID
+ on CALENDAR_OBJECT_REVISIONS(CALENDAR_HOME_RESOURCE_ID);
+
+create index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID
+ on CALENDAR_OBJECT_REVISIONS(CALENDAR_RESOURCE_ID);
+
+
+-------------------------------
+-- AddressBook Object Revisions --
+-------------------------------
+
+create table ADDRESSBOOK_OBJECT_REVISIONS (
+ ADDRESSBOOK_HOME_RESOURCE_ID integer not null references ADDRESSBOOK_HOME,
+ ADDRESSBOOK_RESOURCE_ID integer references ADDRESSBOOK,
+ ADDRESSBOOK_NAME varchar(255) default null,
+ RESOURCE_NAME varchar(255),
+ REVISION integer default nextval('REVISION_SEQ') not null,
+ DELETED boolean not null,
+
+ unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME)
+);
+
+create index ADDRESSBOOK_OBJECT_REVISIONS_HOME_RESOURCE_ID
+ on ADDRESSBOOK_OBJECT_REVISIONS(ADDRESSBOOK_HOME_RESOURCE_ID);
+
+create index ADDRESSBOOK_OBJECT_REVISIONS_RESOURCE_ID
+ on ADDRESSBOOK_OBJECT_REVISIONS(ADDRESSBOOK_RESOURCE_ID);
+
+-----------------------------------
+-- Notification Object Revisions --
+-----------------------------------
+
+create table NOTIFICATION_OBJECT_REVISIONS (
+ NOTIFICATION_HOME_RESOURCE_ID integer not null references NOTIFICATION_HOME on delete cascade,
+ RESOURCE_NAME varchar(255),
+ REVISION integer default nextval('REVISION_SEQ') not null,
+ DELETED boolean not null,
+
+ unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME)
+);
+
+
+create index NOTIFICATION_OBJECT_REVISIONS_HOME_RESOURCE_ID
+ on NOTIFICATION_OBJECT_REVISIONS(NOTIFICATION_HOME_RESOURCE_ID);
+
+
+--------------------
+-- Schema Version --
+--------------------
+
+create table CALENDARSERVER (
+ NAME varchar(255),
+ VALUE varchar(255),
+ unique(NAME)
+);
+
+insert into CALENDARSERVER values ('VERSION', '4');
+
Added: 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 (rev 0)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_4_to_5.sql 2011-09-20 15:50:54 UTC (rev 8107)
@@ -0,0 +1,108 @@
+----
+-- Copyright (c) 2011 Apple Inc. All rights reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+----
+
+-------------------------------------------------
+-- Upgrade database schema from VERSION 4 to 5 --
+-------------------------------------------------
+
+-- Changes related to primary key and index optimizations
+
+drop index CALENDAR_HOME_OWNER_UID;
+
+drop index CALENDAR_HOME_METADATA_RESOURCE_ID;
+alter table CALENDAR_HOME_METADATA
+ add primary key(RESOURCE_ID);
+
+drop index INVITE_RESOURCE_ID;
+create index INVITE_RESOURCE_ID on INVITE(RESOURCE_ID);
+
+drop index INVITE_HOME_RESOURCE_ID;
+create index INVITE_HOME_RESOURCE_ID on INVITE(HOME_RESOURCE_ID);
+
+drop index NOTIFICATION_HOME_OWNER_UID;
+
+drop index NOTIFICATION_NOTIFICATION_UID;
+
+drop index CALENDAR_BIND_HOME_RESOURCE_ID;
+
+drop index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID;
+
+drop index ATTACHMENT_DROPBOX_ID;
+alter table ATTACHMENT
+ drop unique(DROPBOX_ID, PATH),
+ add primary key(DROPBOX_ID, PATH);
+create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
+ ATTACHMENT(CALENDAR_HOME_RESOURCE_ID);
+
+drop index ADDRESSBOOK_HOME_OWNER_UID;
+
+drop index ADDRESSBOOK_HOME_METADATA_RESOURCE_ID;
+alter table ADDRESSBOOK_HOME_METADATA
+ add primary key(RESOURCE_ID);
+
+drop index ADDRESSBOOK_BIND_HOME_RESOURCE_ID;
+
+drop index ADDRESSBOOK_OBJECT_ADDRESSBOOK_RESOURCE_ID;
+
+drop index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID;
+
+drop index ADDRESSBOOK_OBJECT_REVISIONS_RESOURCE_ID;
+
+drop index NOTIFICATION_OBJECT_REVISIONS_HOME_RESOURCE_ID;
+
+alter table CALENDARSERVER
+ drop unique(NAME),
+ add primary key(NAME);
+
+-- Changes to restore multi-column primary key and uniques lost in translation of v4
+
+alter table NOTIFICATION
+ add unique(NOTIFICATION_UID, NOTIFICATION_HOME_RESOURCE_ID);
+
+alter table CALENDAR_BIND
+ add primary key(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_ID),
+ add unique(CALENDAR_HOME_RESOURCE_ID, CALENDAR_RESOURCE_NAME);
+
+alter table CALENDAR_OBJECT
+ add unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME);
+
+--alter table ATTACHMENT
+-- add primary key(DROPBOX_ID, PATH);
+
+alter table RESOURCE_PROPERTY
+ add primary key(RESOURCE_ID, NAME, VIEWER_UID);
+
+alter table ADDRESSBOOK_BIND
+ add primary key(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID),
+ 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, VCARD_UID);
+
+alter table CALENDAR_OBJECT_REVISIONS
+ add unique(CALENDAR_RESOURCE_ID, RESOURCE_NAME);
+
+alter table CALENDAR_OBJECT_REVISIONS
+ add unique(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME);
+
+alter table NOTIFICATION_OBJECT_REVISIONS
+ add unique(NOTIFICATION_HOME_RESOURCE_ID, RESOURCE_NAME);
+
+
+-- Now update the version
+update CALENDARSERVER set VALUE = '5' where NAME = 'VERSION';
+
Added: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_4_to_5.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_4_to_5.sql (rev 0)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_4_to_5.sql 2011-09-20 15:50:54 UTC (rev 8107)
@@ -0,0 +1,72 @@
+----
+-- Copyright (c) 2011 Apple Inc. All rights reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+----
+
+-------------------------------------------------
+-- Upgrade database schema from VERSION 4 to 5 --
+-------------------------------------------------
+
+-- Changes related to primary key and index optimizations
+
+drop index CALENDAR_HOME_OWNER_UID;
+
+drop index CALENDAR_HOME_METADATA_RESOURCE_ID;
+alter table CALENDAR_HOME_METADATA
+ add primary key(RESOURCE_ID);
+
+drop index INVITE_RESOURCE_ID;
+create index INVITE_RESOURCE_ID on INVITE(RESOURCE_ID);
+
+drop index INVITE_HOME_RESOURCE_ID;
+create index INVITE_HOME_RESOURCE_ID on INVITE(HOME_RESOURCE_ID);
+
+drop index NOTIFICATION_HOME_OWNER_UID;
+
+drop index NOTIFICATION_NOTIFICATION_UID;
+
+drop index CALENDAR_BIND_HOME_RESOURCE_ID;
+
+drop index CALENDAR_OBJECT_CALENDAR_RESOURCE_ID;
+
+drop index ATTACHMENT_DROPBOX_ID;
+alter table ATTACHMENT
+ drop constraint ATTACHMENT_DROPBOX_ID_PATH_KEY,
+ add primary key(DROPBOX_ID, PATH);
+create index ATTACHMENT_CALENDAR_HOME_RESOURCE_ID on
+ ATTACHMENT(CALENDAR_HOME_RESOURCE_ID);
+
+drop index ADDRESSBOOK_HOME_OWNER_UID;
+
+drop index ADDRESSBOOK_HOME_METADATA_RESOURCE_ID;
+alter table ADDRESSBOOK_HOME_METADATA
+ add primary key(RESOURCE_ID);
+
+drop index ADDRESSBOOK_BIND_HOME_RESOURCE_ID;
+
+drop index ADDRESSBOOK_OBJECT_ADDRESSBOOK_RESOURCE_ID;
+
+drop index CALENDAR_OBJECT_REVISIONS_RESOURCE_ID;
+
+drop index ADDRESSBOOK_OBJECT_REVISIONS_RESOURCE_ID;
+
+drop index NOTIFICATION_OBJECT_REVISIONS_HOME_RESOURCE_ID;
+
+alter table CALENDARSERVER
+ drop constraint CALENDARSERVER_NAME_KEY,
+ add primary key(NAME);
+
+-- Now update the version
+update CALENDARSERVER set VALUE = '5' where NAME = 'VERSION';
+
Modified: CalendarServer/trunk/txdav/common/datastore/test/test_util.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/test/test_util.py 2011-09-19 20:02:17 UTC (rev 8106)
+++ CalendarServer/trunk/txdav/common/datastore/test/test_util.py 2011-09-20 15:50:54 UTC (rev 8107)
@@ -226,6 +226,13 @@
Tests for L{UpgradeDatabaseSchemaService}.
"""
+ def _getSchemaVersion(self, fp):
+ schema = fp.getContent()
+ found = re.search("insert into CALENDARSERVER values \('VERSION', '(\d)+'\);", schema)
+ if found is None:
+ self.fail("Could not determine schema version for: %s" % (fp,))
+ return int(found.group(1))
+
def test_scanUpgradeFiles(self):
upgrader = UpgradeDatabaseSchemaService(None, None)
@@ -287,18 +294,62 @@
for dialect in (POSTGRES_DIALECT, ORACLE_DIALECT,):
upgrader = UpgradeDatabaseSchemaService(None, None)
files = upgrader.scanForUpgradeFiles(dialect)
+
+ current_version = self._getSchemaVersion(upgrader.schemaLocation.child("current.sql"))
- def _getSchemaVersion(fp):
- schema = fp.getContent()
- found = re.search("insert into CALENDARSERVER values \('VERSION', '(\d)+'\);", schema)
- if found is None:
- self.fail("Could not determine schema version for: %s" % (fp,))
- return int(found.group(1))
-
-
- current_version = _getSchemaVersion(upgrader.schemaLocation.child("current.sql"))
-
for child in upgrader.schemaLocation.child("old").globChildren("*.sql"):
- old_version = _getSchemaVersion(child)
+ old_version = self._getSchemaVersion(child)
upgrades = upgrader.determineUpgradeSequence(old_version, current_version, files, dialect)
self.assertNotEqual(len(upgrades), 0)
+
+ @inlineCallbacks
+ def test_dbUpgrades(self):
+ """
+ This does a full DB test of all possible upgrade paths. For each old schema, it loads it into the DB
+ then runs the upgrade service. This ensures all the upgrade.sql files work correctly - at least for
+ postgres.
+ """
+
+ store = yield theStoreBuilder.buildStore(
+ self, StubNotifierFactory()
+ )
+
+ @inlineCallbacks
+ def _loadOldSchema(path):
+ """
+ Use the postgres schema mechanism to do tests under a separate "namespace"
+ in postgres that we can quickly wipe clean afterwards.
+ """
+ startTxn = store.newTransaction("test_dbUpgrades")
+ yield startTxn.execSQL("create schema test_dbUpgrades;")
+ yield startTxn.execSQL("set search_path to test_dbUpgrades;")
+ yield startTxn.execSQL(path.getContent())
+ yield startTxn.commit()
+
+ @inlineCallbacks
+ def _loadVersion():
+ startTxn = store.newTransaction("test_dbUpgrades")
+ new_version = yield startTxn.execSQL("select value from calendarserver where name = 'VERSION';")
+ yield startTxn.commit()
+ returnValue(int(new_version[0][0]))
+
+ @inlineCallbacks
+ def _unloadOldSchema():
+ startTxn = store.newTransaction("test_dbUpgrades")
+ yield startTxn.execSQL("set search_path to public;")
+ yield startTxn.execSQL("drop schema test_dbUpgrades cascade;")
+ yield startTxn.commit()
+
+ test_upgrader = UpgradeDatabaseSchemaService(None, None)
+ expected_version = self._getSchemaVersion(test_upgrader.schemaLocation.child("current.sql"))
+ for child in test_upgrader.schemaLocation.child("old").globChildren("*.sql"):
+ try:
+ upgrader = UpgradeDatabaseSchemaService(store, None)
+ yield _loadOldSchema(child)
+ yield upgrader.doUpgrade()
+ new_version = yield _loadVersion()
+ yield _unloadOldSchema()
+ except Exception, e:
+ self.fail("Upgrade from %s failed with %s" % (child.basename(), str(e),))
+
+ self.assertEqual(new_version, expected_version)
Modified: CalendarServer/trunk/txdav/common/datastore/util.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/util.py 2011-09-19 20:02:17 UTC (rev 8106)
+++ CalendarServer/trunk/txdav/common/datastore/util.py 2011-09-20 15:50:54 UTC (rev 8107)
@@ -282,7 +282,8 @@
"Database schema check complete, launching database service."
)
# see http://twistedmatrix.com/trac/ticket/4649
- reactor.callLater(0, self.wrappedService.setServiceParent, self.parent)
+ if self.wrappedService:
+ reactor.callLater(0, self.wrappedService.setServiceParent, self.parent)
@inlineCallbacks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110920/59844475/attachment-0001.html>
More information about the calendarserver-changes
mailing list