[CalendarServer-changes] [13191] CalendarServer/trunk/txdav
source_changes at macosforge.org
source_changes at macosforge.org
Tue Apr 8 09:20:53 PDT 2014
Revision: 13191
http://trac.calendarserver.org//changeset/13191
Author: sagen at apple.com
Date: 2014-04-08 09:20:53 -0700 (Tue, 08 Apr 2014)
Log Message:
-----------
change XXX_GUID to XXX_UID in schema for groups/delegation
Modified Paths:
--------------
CalendarServer/trunk/txdav/common/datastore/sql.py
CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql
CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql
CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql
CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql
CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql
CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql
CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_34_to_35.sql
CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_34_to_35.sql
CalendarServer/trunk/txdav/who/groups.py
Modified: CalendarServer/trunk/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql.py 2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2014-04-08 16:20:53 UTC (rev 13191)
@@ -932,7 +932,7 @@
return Insert(
{
gr.NAME: Parameter("name"),
- gr.GROUP_GUID: Parameter("groupUID"),
+ gr.GROUP_UID: Parameter("groupUID"),
gr.MEMBERSHIP_HASH: Parameter("membershipHash")
},
Return=gr.GROUP_ID
@@ -949,7 +949,7 @@
gr.MODIFIED:
Parameter("timestamp")
},
- Where=(gr.GROUP_GUID == Parameter("groupUID"))
+ Where=(gr.GROUP_UID == Parameter("groupUID"))
)
@@ -959,7 +959,7 @@
return Select(
[gr.GROUP_ID, gr.NAME, gr.MEMBERSHIP_HASH, gr.MODIFIED],
From=gr,
- Where=(gr.GROUP_GUID == Parameter("groupUID"))
+ Where=(gr.GROUP_UID == Parameter("groupUID"))
)
@@ -967,7 +967,7 @@
def _groupByID(cls):
gr = schema.GROUPS
return Select(
- [gr.GROUP_GUID, gr.NAME, gr.MEMBERSHIP_HASH],
+ [gr.GROUP_UID, gr.NAME, gr.MEMBERSHIP_HASH],
From=gr,
Where=(gr.GROUP_ID == Parameter("groupID"))
)
@@ -1109,7 +1109,7 @@
return Insert(
{
gm.GROUP_ID: Parameter("groupID"),
- gm.MEMBER_GUID: Parameter("memberUID")
+ gm.MEMBER_UID: Parameter("memberUID")
}
)
@@ -1122,7 +1122,7 @@
Where=(
gm.GROUP_ID == Parameter("groupID")
).And(
- gm.MEMBER_GUID == Parameter("memberUID")
+ gm.MEMBER_UID == Parameter("memberUID")
)
)
@@ -1131,7 +1131,7 @@
def _selectGroupMembersQuery(cls):
gm = schema.GROUP_MEMBERSHIP
return Select(
- [gm.MEMBER_GUID],
+ [gm.MEMBER_UID],
From=gm,
Where=(
gm.GROUP_ID == Parameter("groupID")
@@ -1145,7 +1145,7 @@
gm = schema.GROUP_MEMBERSHIP
return Select(
- [gr.GROUP_GUID],
+ [gr.GROUP_UID],
From=gr,
Where=(
gr.GROUP_ID.In(
@@ -1153,7 +1153,7 @@
[gm.GROUP_ID],
From=gm,
Where=(
- gm.MEMBER_GUID == Parameter("uid")
+ gm.MEMBER_UID == Parameter("uid")
)
)
)
@@ -1328,7 +1328,7 @@
gr = schema.GROUPS
return Select(
- [gr.GROUP_GUID],
+ [gr.GROUP_UID],
From=gr,
Where=(
gr.GROUP_ID.In(
@@ -1373,7 +1373,7 @@
Select(
[gm.GROUP_ID],
From=gm,
- Where=(gm.MEMBER_GUID == Parameter("delegate"))
+ Where=(gm.MEMBER_UID == Parameter("delegate"))
)
).And(
dg.READ_WRITE == Parameter("readWrite")
@@ -1388,7 +1388,7 @@
gm = schema.GROUP_MEMBERSHIP
return Select(
- [gm.MEMBER_GUID],
+ [gm.MEMBER_UID],
From=gm,
Where=(
gm.GROUP_ID.In(
@@ -1407,7 +1407,7 @@
def _selectExternalDelegateGroupsQuery(cls):
edg = schema.EXTERNAL_DELEGATE_GROUPS
return Select(
- [edg.DELEGATOR, edg.GROUP_GUID_READ, edg.GROUP_GUID_WRITE],
+ [edg.DELEGATOR, edg.GROUP_UID_READ, edg.GROUP_UID_WRITE],
From=edg
)
@@ -1429,8 +1429,8 @@
return Insert(
{
edg.DELEGATOR: Parameter("delegator"),
- edg.GROUP_GUID_READ: Parameter("readDelegate"),
- edg.GROUP_GUID_WRITE: Parameter("writeDelegate"),
+ edg.GROUP_UID_READ: Parameter("readDelegate"),
+ edg.GROUP_UID_WRITE: Parameter("writeDelegate"),
}
)
@@ -1713,7 +1713,7 @@
dg = schema.DELEGATE_GROUPS
results = (yield Select(
- [gr.GROUP_GUID],
+ [gr.GROUP_UID],
From=gr,
Where=(gr.GROUP_ID.In(Select([dg.GROUP_ID], From=dg, Where=None)))
).on(self))
Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2014-04-08 16:20:53 UTC (rev 13191)
@@ -8,7 +8,7 @@
"HOSTNAME" nvarchar2(255),
"PID" integer not null,
"PORT" integer not null,
- "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
+ "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
primary key("HOSTNAME", "PORT")
);
@@ -80,7 +80,7 @@
"NOTIFICATION_DATA" nclob,
"MD5" nchar(32),
"CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
- "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
);
@@ -98,8 +98,8 @@
"ALARM_VEVENT_ALLDAY" nclob default null,
"ALARM_VTODO_TIMED" nclob default null,
"ALARM_VTODO_ALLDAY" nclob default null,
- "TIMEZONE" nclob default null,
- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ "TIMEZONE" nclob default null,
+ primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
);
@@ -149,7 +149,7 @@
"PRIVATE_COMMENTS" integer default 0 not null,
"MD5" nchar(32),
"CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
- "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
);
@@ -213,8 +213,8 @@
create table ATTACHMENT_CALENDAR_OBJECT (
"ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
"MANAGED_ID" nvarchar2(255),
- "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
+ primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
);
@@ -222,7 +222,7 @@
"RESOURCE_ID" integer not null,
"NAME" nvarchar2(255),
"VALUE" nclob,
- "VIEWER_UID" nvarchar2(255),
+ "VIEWER_UID" nvarchar2(255),
primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
);
@@ -249,8 +249,8 @@
"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_HOME_RESOURCE_ID"),
+ "MESSAGE" nclob,
+ primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
);
@@ -263,8 +263,8 @@
"KIND" integer not null,
"MD5" nchar(32),
"CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
- "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
);
@@ -283,14 +283,14 @@
"MEMBER_ID" integer not null,
"REVISION" integer not null,
"REMOVED" integer default 0 not null,
- "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
primary key("GROUP_ID", "MEMBER_ID", "REVISION")
);
create table ABO_FOREIGN_MEMBERS (
"GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
"ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
- "MEMBER_ADDRESS" nvarchar2(255),
+ "MEMBER_ADDRESS" nvarchar2(255),
primary key("GROUP_ID", "MEMBER_ADDRESS")
);
@@ -302,8 +302,8 @@
"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"),
+ "MESSAGE" nclob,
+ primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
);
@@ -333,7 +333,7 @@
"RESOURCE_NAME" nvarchar2(255),
"REVISION" integer not null,
"DELETED" integer not null,
- "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
);
@@ -343,7 +343,7 @@
"MODIFIED" integer not null,
"SUBSCRIBER_GUID" nvarchar2(255),
"USER_AGENT" nvarchar2(255) default null,
- "IP_ADDR" nvarchar2(255) default null,
+ "IP_ADDR" nvarchar2(255) default null,
primary key("TOKEN", "RESOURCE_KEY")
);
@@ -352,7 +352,7 @@
"ORGANIZER" nvarchar2(255),
"ATTENDEE" nvarchar2(255),
"ICALUID" nvarchar2(255),
- "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
primary key("ORGANIZER", "ATTENDEE", "ICALUID")
);
@@ -392,7 +392,7 @@
create table GROUP_REFRESH_WORK (
"WORK_ID" integer primary key not null,
"JOB_ID" integer not null references JOB,
- "GROUP_GUID" nvarchar2(255)
+ "GROUP_UID" nvarchar2(255)
);
create table GROUP_ATTENDEE_RECONCILIATION_ (
@@ -405,7 +405,7 @@
create table GROUPS (
"GROUP_ID" integer primary key,
"NAME" nvarchar2(255),
- "GROUP_GUID" nvarchar2(255),
+ "GROUP_UID" nvarchar2(255),
"MEMBERSHIP_HASH" nvarchar2(255),
"EXTANT" integer default 1,
"CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
@@ -414,7 +414,7 @@
create table GROUP_MEMBERSHIP (
"GROUP_ID" integer,
- "MEMBER_GUID" nvarchar2(255)
+ "MEMBER_UID" nvarchar2(255)
);
create table GROUP_ATTENDEE (
@@ -438,8 +438,8 @@
create table EXTERNAL_DELEGATE_GROUPS (
"DELEGATOR" nvarchar2(255),
- "GROUP_GUID_READ" nvarchar2(255),
- "GROUP_GUID_WRITE" nvarchar2(255)
+ "GROUP_UID_READ" nvarchar2(255),
+ "GROUP_UID_WRITE" nvarchar2(255)
);
create table CALENDAR_OBJECT_SPLITTER_WORK (
@@ -698,8 +698,8 @@
JOB_ID
);
-create index GROUPS_GROUP_GUID_ebf7a1d4 on GROUPS (
- GROUP_GUID
+create index GROUPS_GROUP_UID_ebf7a1d4 on GROUPS (
+ GROUP_UID
);
create index GROUP_MEMBERSHIP_GROU_9560a5e6 on GROUP_MEMBERSHIP (
@@ -707,7 +707,7 @@
);
create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
- MEMBER_GUID
+ MEMBER_UID
);
create index CALENDAR_OBJECT_SPLIT_af71dcda on CALENDAR_OBJECT_SPLITTER_WORK (
Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql 2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/current.sql 2014-04-08 16:20:53 UTC (rev 13191)
@@ -456,7 +456,7 @@
BIND_REVISION integer default 0 not null,
MESSAGE text, -- FIXME: xml?
- primary key (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID), -- implicit index
+ primary key (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_HOME_RESOURCE_ID), -- implicit index
unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
);
@@ -513,7 +513,7 @@
GROUP_ID integer not null, -- references ADDRESSBOOK_OBJECT on delete cascade, -- AddressBook Object's (kind=='group') RESOURCE_ID
ADDRESSBOOK_ID integer not null references ADDRESSBOOK_HOME on delete cascade,
MEMBER_ID integer not null, -- references ADDRESSBOOK_OBJECT, -- member AddressBook Object's RESOURCE_ID
- REVISION integer default nextval('REVISION_SEQ') not null,
+ REVISION integer default nextval('REVISION_SEQ') not null,
REMOVED boolean default false not null,
MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
@@ -755,7 +755,7 @@
create table GROUP_REFRESH_WORK (
WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
JOB_ID integer references JOB not null,
- GROUP_GUID varchar(255) not null
+ GROUP_UID varchar(255) not null
);
create index GROUP_REFRESH_WORK_JOB_ID on
@@ -775,23 +775,23 @@
create table GROUPS (
GROUP_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
NAME varchar(255) not null,
- GROUP_GUID varchar(255) not null,
+ GROUP_UID varchar(255) not null,
MEMBERSHIP_HASH varchar(255) not null,
EXTANT integer default 1,
CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP)
);
-create index GROUPS_GROUP_GUID on
- GROUPS(GROUP_GUID);
+create index GROUPS_GROUP_UID on
+ GROUPS(GROUP_UID);
create table GROUP_MEMBERSHIP (
GROUP_ID integer,
- MEMBER_GUID varchar(255) not null
+ MEMBER_UID varchar(255) not null
);
create index GROUP_MEMBERSHIP_GROUP on
GROUP_MEMBERSHIP(GROUP_ID);
create index GROUP_MEMBERSHIP_MEMBER on
- GROUP_MEMBERSHIP(MEMBER_GUID);
+ GROUP_MEMBERSHIP(MEMBER_UID);
create table GROUP_ATTENDEE (
GROUP_ID integer,
@@ -818,8 +818,8 @@
create table EXTERNAL_DELEGATE_GROUPS (
DELEGATOR varchar(255) not null,
- GROUP_GUID_READ varchar(255),
- GROUP_GUID_WRITE varchar(255)
+ GROUP_UID_READ varchar(255),
+ GROUP_UID_WRITE varchar(255)
);
--------------------------
Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql 2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v35.sql 2014-04-08 16:20:53 UTC (rev 13191)
@@ -7,7 +7,7 @@
"HOSTNAME" nvarchar2(255),
"PID" integer not null,
"PORT" integer not null,
- "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
+ "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
primary key("HOSTNAME", "PORT")
);
@@ -70,7 +70,7 @@
"NOTIFICATION_DATA" nclob,
"MD5" nchar(32),
"CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
- "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
);
@@ -88,8 +88,8 @@
"ALARM_VEVENT_ALLDAY" nclob default null,
"ALARM_VTODO_TIMED" nclob default null,
"ALARM_VTODO_ALLDAY" nclob default null,
- "TIMEZONE" nclob default null,
- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ "TIMEZONE" nclob default null,
+ primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
);
@@ -139,7 +139,7 @@
"PRIVATE_COMMENTS" integer default 0 not null,
"MD5" nchar(32),
"CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
- "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
);
@@ -203,8 +203,8 @@
create table ATTACHMENT_CALENDAR_OBJECT (
"ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
"MANAGED_ID" nvarchar2(255),
- "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
+ primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
);
@@ -212,7 +212,7 @@
"RESOURCE_ID" integer not null,
"NAME" nvarchar2(255),
"VALUE" nclob,
- "VIEWER_UID" nvarchar2(255),
+ "VIEWER_UID" nvarchar2(255),
primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
);
@@ -239,8 +239,8 @@
"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_HOME_RESOURCE_ID"),
+ "MESSAGE" nclob,
+ primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
);
@@ -253,8 +253,8 @@
"KIND" integer not null,
"MD5" nchar(32),
"CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
- "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
);
@@ -273,14 +273,14 @@
"MEMBER_ID" integer not null,
"REVISION" integer not null,
"REMOVED" integer default 0 not null,
- "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
primary key("GROUP_ID", "MEMBER_ID", "REVISION")
);
create table ABO_FOREIGN_MEMBERS (
"GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
"ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
- "MEMBER_ADDRESS" nvarchar2(255),
+ "MEMBER_ADDRESS" nvarchar2(255),
primary key("GROUP_ID", "MEMBER_ADDRESS")
);
@@ -292,8 +292,8 @@
"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"),
+ "MESSAGE" nclob,
+ primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
);
@@ -323,7 +323,7 @@
"RESOURCE_NAME" nvarchar2(255),
"REVISION" integer not null,
"DELETED" integer not null,
- "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
);
@@ -333,7 +333,7 @@
"MODIFIED" integer not null,
"SUBSCRIBER_GUID" nvarchar2(255),
"USER_AGENT" nvarchar2(255) default null,
- "IP_ADDR" nvarchar2(255) default null,
+ "IP_ADDR" nvarchar2(255) default null,
primary key("TOKEN", "RESOURCE_KEY")
);
@@ -342,7 +342,7 @@
"ORGANIZER" nvarchar2(255),
"ATTENDEE" nvarchar2(255),
"ICALUID" nvarchar2(255),
- "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
primary key("ORGANIZER", "ATTENDEE", "ICALUID")
);
@@ -382,7 +382,7 @@
create table GROUP_REFRESH_WORK (
"WORK_ID" integer primary key not null,
"NOT_BEFORE" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
- "GROUP_GUID" nvarchar2(255)
+ "GROUP_UID" nvarchar2(255)
);
create table GROUP_ATTENDEE_RECONCILIATION_ (
@@ -395,7 +395,7 @@
create table GROUPS (
"GROUP_ID" integer primary key,
"NAME" nvarchar2(255),
- "GROUP_GUID" nvarchar2(255),
+ "GROUP_UID" nvarchar2(255),
"MEMBERSHIP_HASH" nvarchar2(255),
"EXTANT" integer default 1,
"CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
@@ -404,7 +404,7 @@
create table GROUP_MEMBERSHIP (
"GROUP_ID" integer,
- "MEMBER_GUID" nvarchar2(255)
+ "MEMBER_UID" nvarchar2(255)
);
create table GROUP_ATTENDEE (
@@ -428,8 +428,8 @@
create table EXTERNAL_DELEGATE_GROUPS (
"DELEGATOR" nvarchar2(255),
- "GROUP_GUID_READ" nvarchar2(255),
- "GROUP_GUID_WRITE" nvarchar2(255)
+ "GROUP_UID_READ" nvarchar2(255),
+ "GROUP_UID_WRITE" nvarchar2(255)
);
create table CALENDAR_OBJECT_SPLITTER_WORK (
@@ -649,8 +649,8 @@
TOKEN
);
-create index GROUPS_GROUP_GUID_ebf7a1d4 on GROUPS (
- GROUP_GUID
+create index GROUPS_GROUP_UID_ebf7a1d4 on GROUPS (
+ GROUP_UID
);
create index GROUP_MEMBERSHIP_GROU_9560a5e6 on GROUP_MEMBERSHIP (
@@ -658,7 +658,7 @@
);
create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
- MEMBER_GUID
+ MEMBER_UID
);
create index CALENDAR_OBJECT_SPLIT_af71dcda on CALENDAR_OBJECT_SPLITTER_WORK (
Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql 2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/oracle-dialect/v36.sql 2014-04-08 16:20:53 UTC (rev 13191)
@@ -7,7 +7,7 @@
"HOSTNAME" nvarchar2(255),
"PID" integer not null,
"PORT" integer not null,
- "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
+ "TIME" timestamp default CURRENT_TIMESTAMP at time zone 'UTC' not null,
primary key("HOSTNAME", "PORT")
);
@@ -70,7 +70,7 @@
"NOTIFICATION_DATA" nclob,
"MD5" nchar(32),
"CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
- "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
unique("NOTIFICATION_UID", "NOTIFICATION_HOME_RESOURCE_ID")
);
@@ -88,8 +88,8 @@
"ALARM_VEVENT_ALLDAY" nclob default null,
"ALARM_VTODO_TIMED" nclob default null,
"ALARM_VTODO_ALLDAY" nclob default null,
- "TIMEZONE" nclob default null,
- primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
+ "TIMEZONE" nclob default null,
+ primary key("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_ID"),
unique("CALENDAR_HOME_RESOURCE_ID", "CALENDAR_RESOURCE_NAME")
);
@@ -139,7 +139,7 @@
"PRIVATE_COMMENTS" integer default 0 not null,
"MD5" nchar(32),
"CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
- "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
unique("CALENDAR_RESOURCE_ID", "RESOURCE_NAME")
);
@@ -203,8 +203,8 @@
create table ATTACHMENT_CALENDAR_OBJECT (
"ATTACHMENT_ID" integer not null references ATTACHMENT on delete cascade,
"MANAGED_ID" nvarchar2(255),
- "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
- primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
+ "CALENDAR_OBJECT_RESOURCE_ID" integer not null references CALENDAR_OBJECT on delete cascade,
+ primary key("ATTACHMENT_ID", "CALENDAR_OBJECT_RESOURCE_ID"),
unique("MANAGED_ID", "CALENDAR_OBJECT_RESOURCE_ID")
);
@@ -212,7 +212,7 @@
"RESOURCE_ID" integer not null,
"NAME" nvarchar2(255),
"VALUE" nclob,
- "VIEWER_UID" nvarchar2(255),
+ "VIEWER_UID" nvarchar2(255),
primary key("RESOURCE_ID", "NAME", "VIEWER_UID")
);
@@ -239,8 +239,8 @@
"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_HOME_RESOURCE_ID"),
+ "MESSAGE" nclob,
+ primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "OWNER_HOME_RESOURCE_ID"),
unique("ADDRESSBOOK_HOME_RESOURCE_ID", "ADDRESSBOOK_RESOURCE_NAME")
);
@@ -253,8 +253,8 @@
"KIND" integer not null,
"MD5" nchar(32),
"CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
- "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
- unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ unique("ADDRESSBOOK_HOME_RESOURCE_ID", "RESOURCE_NAME"),
unique("ADDRESSBOOK_HOME_RESOURCE_ID", "VCARD_UID")
);
@@ -273,14 +273,14 @@
"MEMBER_ID" integer not null,
"REVISION" integer not null,
"REMOVED" integer default 0 not null,
- "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
primary key("GROUP_ID", "MEMBER_ID", "REVISION")
);
create table ABO_FOREIGN_MEMBERS (
"GROUP_ID" integer not null references ADDRESSBOOK_OBJECT on delete cascade,
"ADDRESSBOOK_ID" integer not null references ADDRESSBOOK_HOME on delete cascade,
- "MEMBER_ADDRESS" nvarchar2(255),
+ "MEMBER_ADDRESS" nvarchar2(255),
primary key("GROUP_ID", "MEMBER_ADDRESS")
);
@@ -292,8 +292,8 @@
"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"),
+ "MESSAGE" nclob,
+ primary key("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_RESOURCE_ID"),
unique("ADDRESSBOOK_HOME_RESOURCE_ID", "GROUP_ADDRESSBOOK_NAME")
);
@@ -323,7 +323,7 @@
"RESOURCE_NAME" nvarchar2(255),
"REVISION" integer not null,
"DELETED" integer not null,
- "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "MODIFIED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
unique("NOTIFICATION_HOME_RESOURCE_ID", "RESOURCE_NAME")
);
@@ -333,7 +333,7 @@
"MODIFIED" integer not null,
"SUBSCRIBER_GUID" nvarchar2(255),
"USER_AGENT" nvarchar2(255) default null,
- "IP_ADDR" nvarchar2(255) default null,
+ "IP_ADDR" nvarchar2(255) default null,
primary key("TOKEN", "RESOURCE_KEY")
);
@@ -342,7 +342,7 @@
"ORGANIZER" nvarchar2(255),
"ATTENDEE" nvarchar2(255),
"ICALUID" nvarchar2(255),
- "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
+ "ACCESSED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
primary key("ORGANIZER", "ATTENDEE", "ICALUID")
);
@@ -382,7 +382,7 @@
create table GROUP_REFRESH_WORK (
"WORK_ID" integer primary key not null,
"NOT_BEFORE" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
- "GROUP_GUID" nvarchar2(255)
+ "GROUP_UID" nvarchar2(255)
);
create table GROUP_ATTENDEE_RECONCILIATION_ (
@@ -395,7 +395,7 @@
create table GROUPS (
"GROUP_ID" integer primary key,
"NAME" nvarchar2(255),
- "GROUP_GUID" nvarchar2(255),
+ "GROUP_UID" nvarchar2(255),
"MEMBERSHIP_HASH" nvarchar2(255),
"EXTANT" integer default 1,
"CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
@@ -404,7 +404,7 @@
create table GROUP_MEMBERSHIP (
"GROUP_ID" integer,
- "MEMBER_GUID" nvarchar2(255)
+ "MEMBER_UID" nvarchar2(255)
);
create table GROUP_ATTENDEE (
@@ -428,8 +428,8 @@
create table EXTERNAL_DELEGATE_GROUPS (
"DELEGATOR" nvarchar2(255),
- "GROUP_GUID_READ" nvarchar2(255),
- "GROUP_GUID_WRITE" nvarchar2(255)
+ "GROUP_UID_READ" nvarchar2(255),
+ "GROUP_UID_WRITE" nvarchar2(255)
);
create table CALENDAR_OBJECT_SPLITTER_WORK (
@@ -660,8 +660,8 @@
TOKEN
);
-create index GROUPS_GROUP_GUID_ebf7a1d4 on GROUPS (
- GROUP_GUID
+create index GROUPS_GROUP_UID_ebf7a1d4 on GROUPS (
+ GROUP_UID
);
create index GROUP_MEMBERSHIP_GROU_9560a5e6 on GROUP_MEMBERSHIP (
@@ -669,7 +669,7 @@
);
create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
- MEMBER_GUID
+ MEMBER_UID
);
create index CALENDAR_OBJECT_SPLIT_af71dcda on CALENDAR_OBJECT_SPLITTER_WORK (
Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql 2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v35.sql 2014-04-08 16:20:53 UTC (rev 13191)
@@ -717,7 +717,7 @@
create table GROUP_REFRESH_WORK (
WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
NOT_BEFORE timestamp default timezone('UTC', CURRENT_TIMESTAMP),
- GROUP_GUID varchar(255) not null
+ GROUP_UID varchar(255) not null
);
create table GROUP_ATTENDEE_RECONCILIATION_WORK (
@@ -731,20 +731,20 @@
create table GROUPS (
GROUP_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
NAME varchar(255) not null,
- GROUP_GUID varchar(255) not null,
+ GROUP_UID varchar(255) not null,
MEMBERSHIP_HASH varchar(255) not null,
EXTANT integer default 1,
CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP)
);
-create index GROUPS_GROUP_GUID on GROUPS(GROUP_GUID);
+create index GROUPS_GROUP_UID on GROUPS(GROUP_UID);
create table GROUP_MEMBERSHIP (
GROUP_ID integer,
- MEMBER_GUID varchar(255) not null
+ MEMBER_UID varchar(255) not null
);
create index GROUP_MEMBERSHIP_GROUP on GROUP_MEMBERSHIP(GROUP_ID);
-create index GROUP_MEMBERSHIP_MEMBER on GROUP_MEMBERSHIP(MEMBER_GUID);
+create index GROUP_MEMBERSHIP_MEMBER on GROUP_MEMBERSHIP(MEMBER_UID);
create table GROUP_ATTENDEE (
GROUP_ID integer,
@@ -771,8 +771,8 @@
create table EXTERNAL_DELEGATE_GROUPS (
DELEGATOR varchar(255) not null,
- GROUP_GUID_READ varchar(255),
- GROUP_GUID_WRITE varchar(255)
+ GROUP_UID_READ varchar(255),
+ GROUP_UID_WRITE varchar(255)
);
--------------------------
Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql 2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/old/postgres-dialect/v36.sql 2014-04-08 16:20:53 UTC (rev 13191)
@@ -717,7 +717,7 @@
create table GROUP_REFRESH_WORK (
WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
NOT_BEFORE timestamp default timezone('UTC', CURRENT_TIMESTAMP),
- GROUP_GUID varchar(255) not null
+ GROUP_UID varchar(255) not null
);
create table GROUP_ATTENDEE_RECONCILIATION_WORK (
@@ -731,20 +731,20 @@
create table GROUPS (
GROUP_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
NAME varchar(255) not null,
- GROUP_GUID varchar(255) not null,
+ GROUP_UID varchar(255) not null,
MEMBERSHIP_HASH varchar(255) not null,
EXTANT integer default 1,
CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP)
);
-create index GROUPS_GROUP_GUID on GROUPS(GROUP_GUID);
+create index GROUPS_GROUP_UID on GROUPS(GROUP_UID);
create table GROUP_MEMBERSHIP (
GROUP_ID integer,
- MEMBER_GUID varchar(255) not null
+ MEMBER_UID varchar(255) not null
);
create index GROUP_MEMBERSHIP_GROUP on GROUP_MEMBERSHIP(GROUP_ID);
-create index GROUP_MEMBERSHIP_MEMBER on GROUP_MEMBERSHIP(MEMBER_GUID);
+create index GROUP_MEMBERSHIP_MEMBER on GROUP_MEMBERSHIP(MEMBER_UID);
create table GROUP_ATTENDEE (
GROUP_ID integer,
@@ -771,8 +771,8 @@
create table EXTERNAL_DELEGATE_GROUPS (
DELEGATOR varchar(255) not null,
- GROUP_GUID_READ varchar(255),
- GROUP_GUID_WRITE varchar(255)
+ GROUP_UID_READ varchar(255),
+ GROUP_UID_WRITE varchar(255)
);
--------------------------
Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_34_to_35.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_34_to_35.sql 2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/oracle-dialect/upgrade_from_34_to_35.sql 2014-04-08 16:20:53 UTC (rev 13191)
@@ -21,7 +21,7 @@
create table GROUP_REFRESH_WORK (
"WORK_ID" integer primary key not null,
"NOT_BEFORE" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
- "GROUP_GUID" nvarchar2(255)
+ "GROUP_UID" nvarchar2(255)
);
create table GROUP_ATTENDEE_RECONCILIATION_ (
@@ -34,7 +34,7 @@
create table GROUPS (
"GROUP_ID" integer primary key,
"NAME" nvarchar2(255),
- "GROUP_GUID" nvarchar2(255),
+ "GROUP_UID" nvarchar2(255),
"MEMBERSHIP_HASH" nvarchar2(255),
"EXTANT" integer default 1,
"CREATED" timestamp default CURRENT_TIMESTAMP at time zone 'UTC',
@@ -43,7 +43,7 @@
create table GROUP_MEMBERSHIP (
"GROUP_ID" integer,
- "MEMBER_GUID" nvarchar2(255)
+ "MEMBER_UID" nvarchar2(255)
);
create table GROUP_ATTENDEE (
@@ -67,13 +67,13 @@
create table EXTERNAL_DELEGATE_GROUPS (
"DELEGATOR" nvarchar2(255),
- "GROUP_GUID_READ" nvarchar2(255),
- "GROUP_GUID_WRITE" nvarchar2(255)
+ "GROUP_UID_READ" nvarchar2(255),
+ "GROUP_UID_WRITE" nvarchar2(255)
);
-create index GROUPS_GROUP_GUID_ebf7a1d4 on GROUPS (
- GROUP_GUID
+create index GROUPS_GROUP_UID_ebf7a1d4 on GROUPS (
+ GROUP_UID
);
create index GROUP_MEMBERSHIP_GROU_9560a5e6 on GROUP_MEMBERSHIP (
@@ -81,7 +81,7 @@
);
create index GROUP_MEMBERSHIP_MEMB_0ca508e8 on GROUP_MEMBERSHIP (
- MEMBER_GUID
+ MEMBER_UID
);
Modified: CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_34_to_35.sql
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_34_to_35.sql 2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/common/datastore/sql_schema/upgrades/postgres-dialect/upgrade_from_34_to_35.sql 2014-04-08 16:20:53 UTC (rev 13191)
@@ -25,7 +25,7 @@
create table GROUP_REFRESH_WORK (
WORK_ID integer primary key default nextval('WORKITEM_SEQ') not null, -- implicit index
NOT_BEFORE timestamp default timezone('UTC', CURRENT_TIMESTAMP),
- GROUP_GUID varchar(255) not null
+ GROUP_UID varchar(255) not null
);
create table GROUP_ATTENDEE_RECONCILIATION_WORK (
@@ -38,20 +38,20 @@
create table GROUPS (
GROUP_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
NAME varchar(255) not null,
- GROUP_GUID varchar(255) not null,
+ GROUP_UID varchar(255) not null,
MEMBERSHIP_HASH varchar(255) not null,
EXTANT integer default 1,
CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP)
);
-create index GROUPS_GROUP_GUID on GROUPS(GROUP_GUID);
+create index GROUPS_GROUP_UID on GROUPS(GROUP_UID);
create table GROUP_MEMBERSHIP (
GROUP_ID integer,
- MEMBER_GUID varchar(255) not null
+ MEMBER_UID varchar(255) not null
);
create index GROUP_MEMBERSHIP_GROUP on GROUP_MEMBERSHIP(GROUP_ID);
-create index GROUP_MEMBERSHIP_MEMBER on GROUP_MEMBERSHIP(MEMBER_GUID);
+create index GROUP_MEMBERSHIP_MEMBER on GROUP_MEMBERSHIP(MEMBER_UID);
create table GROUP_ATTENDEE (
GROUP_ID integer,
@@ -78,8 +78,8 @@
create table EXTERNAL_DELEGATE_GROUPS (
DELEGATOR varchar(255) not null,
- GROUP_GUID_READ varchar(255),
- GROUP_GUID_WRITE varchar(255)
+ GROUP_UID_READ varchar(255),
+ GROUP_UID_WRITE varchar(255)
);
-- Now update the version
Modified: CalendarServer/trunk/txdav/who/groups.py
===================================================================
--- CalendarServer/trunk/txdav/who/groups.py 2014-04-08 16:20:15 UTC (rev 13190)
+++ CalendarServer/trunk/txdav/who/groups.py 2014-04-08 16:20:53 UTC (rev 13191)
@@ -112,15 +112,13 @@
class GroupRefreshWork(WorkItem, fromTable(schema.GROUP_REFRESH_WORK)):
- # Note, the schema has "groupGuid", but really it's a UID. At some point
- # we should change the column name.
- group = property(lambda self: self.groupGuid)
+ group = property(lambda self: self.groupUid)
@inlineCallbacks
def doWork(self):
# Delete all other work items for this group
yield Delete(
- From=self.table, Where=(self.table.GROUP_GUID == self.groupGuid)
+ From=self.table, Where=(self.table.GROUP_UID == self.groupUid)
).on(self.transaction)
groupCacher = getattr(self.transaction, "_groupCacher", None)
@@ -128,12 +126,12 @@
try:
yield groupCacher.refreshGroup(
- self.transaction, self.groupGuid.decode("utf-8")
+ self.transaction, self.groupUid.decode("utf-8")
)
except Exception, e:
log.error(
"Failed to refresh group {group} {err}",
- group=self.groupGuid, err=e
+ group=self.groupUid, err=e
)
else:
@@ -143,11 +141,11 @@
)
log.debug(
"Rescheduling group refresh for {group}: {when}",
- group=self.groupGuid, when=notBefore
+ group=self.groupUid, when=notBefore
)
yield self.transaction.enqueue(
GroupRefreshWork,
- groupGuid=self.groupGuid, notBefore=notBefore
+ groupUID=self.groupUid, notBefore=notBefore
)
@@ -248,7 +246,7 @@
)
self.log.debug("Enqueuing group refresh for {u}", u=groupUID)
yield txn.enqueue(
- GroupRefreshWork, groupGuid=groupUID, notBefore=notBefore
+ GroupRefreshWork, groupUid=groupUID, notBefore=notBefore
)
self.log.debug("Enqueued group refresh for {u}", u=groupUID)
@@ -401,7 +399,7 @@
GroupAttendeeReconciliationWork,
eventID=eventID,
groupID=groupID,
- groupGuid=groupUID,
+ groupUID=groupUID,
notBefore=notBefore
)
@@ -427,7 +425,7 @@
if groupIDs:
gr = schema.GROUPS
rows = yield Select(
- [gr.GROUP_GUID, ],
+ [gr.GROUP_UID, ],
From=gr,
Where=gr.GROUP_ID.In(groupIDs)
).on(txn)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140408/0dabc790/attachment-0001.html>
More information about the calendarserver-changes
mailing list