[CalendarServer-changes] [11784] CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/ datastore/sql_schema
source_changes at macosforge.org
source_changes at macosforge.org
Thu Oct 3 13:13:55 PDT 2013
Revision: 11784
http://trac.calendarserver.org//changeset/11784
Author: gaya at apple.com
Date: 2013-10-03 13:13:55 -0700 (Thu, 03 Oct 2013)
Log Message:
-----------
fix merge errors
Modified Paths:
--------------
CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/datastore/sql_schema/old/oracle-dialect/v24.sql
CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_24_to_25.sql
CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_24_to_25.sql
Modified: CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/datastore/sql_schema/old/oracle-dialect/v24.sql
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/datastore/sql_schema/old/oracle-dialect/v24.sql 2013-10-03 20:09:46 UTC (rev 11783)
+++ CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/datastore/sql_schema/old/oracle-dialect/v24.sql 2013-10-03 20:13:55 UTC (rev 11784)
@@ -218,13 +218,13 @@
create table SHARED_ADDRESSBOOK_BIND (
"ADDRESSBOOK_HOME_RESOURCE_ID" integer not null references ADDRESSBOOK_HOME,
- "OWNER_ADDRESSBOOK_HOME_RESOURCE_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
+ "OWNER_HOME_RESOURCE_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
"ADDRESSBOOK_RESOURCE_NAME" nvarchar2(255),
"BIND_MODE" integer not null,
"BIND_STATUS" integer not null,
"BIND_REVISION" integer default 0 not null,
"MESSAGE" nclob,
- primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_ADDRESSBOOK_HOME_RESOURCE_ID"),
+ primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
);
@@ -268,13 +268,13 @@
create table SHARED_GROUP_BIND (
"ADDRESSBOOK_HOME_RESOURCE_ID" integer not null references ADDRESSBOOK_HOME,
"GROUP_RESOURCE_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
- "GROUP_ADDRESSBOOK_RESOURCE_NAME" nvarchar2(255),
+ "GROUP_ADDRESSBOOK_NAME" nvarchar2(255),
"BIND_MODE" integer not null,
"BIND_STATUS" integer not null,
"BIND_REVISION" integer default 0 not null,
"MESSAGE" nclob,
primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_RESOURCE_NAME")
+ unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
);
create table CALENDAR_OBJECT_REVISIONS (
@@ -288,7 +288,7 @@
create table ADDRESSBOOK_OBJECT_REVISIONS (
"ADDRESSBOOK_HOME_RESOURCE_ID" integer not null references ADDRESSBOOK_HOME,
- "OWNER_ADDRESSBOOK_HOME_RESOURCE_ID" integer references ADDRESSBOOK_HOME,
+ "OWNER_HOME_RESOURCE_ID" integer references ADDRESSBOOK_HOME,
"ADDRESSBOOK_NAME" nvarchar2(255) default null,
"RESOURCE_NAME" nvarchar2(255),
"REVISION" integer not null,
@@ -423,7 +423,7 @@
);
create index SHARED_ADDRESSBOOK_BI_e9a2e6d4 on SHARED_ADDRESSBOOK_BIND (
- OWNER_ADDRESSBOOK_HOME_RESOURCE_ID
+ OWNER_HOME_RESOURCE_ID
);
create index ABO_MEMBERS_ADDRESSBO_4effa879 on ABO_MEMBERS (
@@ -457,18 +457,18 @@
REVISION
);
-create index ADDRESSBOOK_OBJECT_RE_40cc2d73 on ADDRESSBOOK_OBJECT_REVISIONS (
+create index ADDRESSBOOK_OBJECT_RE_2bfcf757 on ADDRESSBOOK_OBJECT_REVISIONS (
ADDRESSBOOK_HOME_RESOURCE_ID,
- OWNER_ADDRESSBOOK_HOME_RESOURCE_ID
+ OWNER_HOME_RESOURCE_ID
);
create index ADDRESSBOOK_OBJECT_RE_980b9872 on ADDRESSBOOK_OBJECT_REVISIONS (
- OWNER_ADDRESSBOOK_HOME_RESOURCE_ID,
+ OWNER_HOME_RESOURCE_ID,
RESOURCE_NAME
);
create index ADDRESSBOOK_OBJECT_RE_45004780 on ADDRESSBOOK_OBJECT_REVISIONS (
- OWNER_ADDRESSBOOK_HOME_RESOURCE_ID,
+ OWNER_HOME_RESOURCE_ID,
REVISION
);
Modified: CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_24_to_25.sql
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_24_to_25.sql 2013-10-03 20:09:46 UTC (rev 11783)
+++ CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_24_to_25.sql 2013-10-03 20:13:55 UTC (rev 11784)
@@ -18,32 +18,9 @@
-- Upgrade database schema from VERSION 24 to 25 --
---------------------------------------------------
-----------------------------------------
--- Change Address Book Object Members --
-----------------------------------------
+-- This is actually a noop for Oracle as we had some invalid names in the v20 schema that
+-- were corrected in v20 (but not corrected in postgres which is being updated for v25).
-alter table ABO_MEMBERS
- drop ("abo_members_member_id_fkey");
-alter table ABO_MEMBERS
- drop ("abo_members_group_id_fkey");
-alter table ABO_MEMBERS
- add ("REVISION" integer default nextval('REVISION_SEQ') not null);
-alter table ABO_MEMBERS
- add ("REMOVED" boolean default false not null);
-alter table ABO_MEMBERS
- drop ("abo_members_pkey");
-alter table ABO_MEMBERS
- add ("abo_members_pkey" primary key ("GROUP_ID", "MEMBER_ID", "REVISION"));
-
-------------------------------------------
--- Change Address Book Object Revisions --
-------------------------------------------
-
-alter table ADDRESSBOOK_OBJECT_REVISIONS
- add ("OBJECT_RESOURCE_ID" integer default 0);
-
---------------------
--- Update version --
---------------------
-
+-- Now update the version
+-- No data upgrades
update CALENDARSERVER set VALUE = '25' where NAME = 'VERSION';
Modified: CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_24_to_25.sql
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_24_to_25.sql 2013-10-03 20:09:46 UTC (rev 11783)
+++ CalendarServer/branches/users/gaya/sharedgroupfixes/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_24_to_25.sql 2013-10-03 20:13:55 UTC (rev 11784)
@@ -18,27 +18,18 @@
-- Upgrade database schema from VERSION 24 to 25 --
---------------------------------------------------
-----------------------------------------
--- Change Address Book Object Members --
-----------------------------------------
+-- Rename columns and indexes
+alter table SHARED_ADDRESSBOOK_BIND
+ rename column OWNER_ADDRESSBOOK_HOME_RESOURCE_ID to OWNER_HOME_RESOURCE_ID;
-alter table ABO_MEMBERS
- drop constraint abo_members_member_id_fkey,
- drop constraint abo_members_group_id_fkey,
- add column REVISION integer default nextval('REVISION_SEQ') not null,
- add column REMOVED boolean default false not null,
- drop constraint abo_members_pkey,
- add constraint abo_members_pkey primary key(GROUP_ID, MEMBER_ID, REVISION);
+alter table SHARED_GROUP_BIND
+ rename column GROUP_ADDRESSBOOK_RESOURCE_NAME to GROUP_ADDRESSBOOK_NAME;
-------------------------------------------
--- Change Address Book Object Revisions --
-------------------------------------------
-
alter table ADDRESSBOOK_OBJECT_REVISIONS
- add column OBJECT_RESOURCE_ID integer default 0;
-
---------------------
--- Update version --
---------------------
+ rename column OWNER_ADDRESSBOOK_HOME_RESOURCE_ID to OWNER_HOME_RESOURCE_ID;
+alter index ADDRESSBOOK_OBJECT_REVISIONS_HOME_RESOURCE_ID_OWNER_ADDRESSBOOK_HOME_RESOURCE_ID rename to ADDRESSBOOK_OBJECT_REVISIONS_HOME_RESOURCE_ID_OWNER_HOME_RESOURCE_ID;
+
+-- Now update the version
+-- No data upgrades
update CALENDARSERVER set VALUE = '25' where NAME = 'VERSION';
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20131003/87885236/attachment-0001.html>
More information about the calendarserver-changes
mailing list