[CalendarServer-changes] [11114] CalendarServer/branches/users/gaya/sharedgroups-3
source_changes at macosforge.org
source_changes at macosforge.org
Mon Apr 29 20:24:33 PDT 2013
Revision: 11114
http://trac.calendarserver.org//changeset/11114
Author: gaya at apple.com
Date: 2013-04-29 20:24:33 -0700 (Mon, 29 Apr 2013)
Log Message:
-----------
Rename: ADDRESSBOOK_HOME.HOME_RESOURCE_ID -> ADDRESSBOOK_HOME.PROPERTY_STORE_ID; xxx.ADDRESSBOOK_RESOURCE_ID -> xxx ADDRESSBOOK_HOME_RESOURCE_ID or xxx.OWNER_ADDRESSBOOK_HOME_RESOURCE_ID as appropriate
Modified Paths:
--------------
CalendarServer/branches/users/gaya/sharedgroups-3/contrib/tools/sqldata_from_path.py
CalendarServer/branches/users/gaya/sharedgroups-3/txdav/carddav/datastore/sql.py
CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_legacy.py
CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_schema/current.sql
CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_tables.py
Modified: CalendarServer/branches/users/gaya/sharedgroups-3/contrib/tools/sqldata_from_path.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/contrib/tools/sqldata_from_path.py 2013-04-29 20:02:58 UTC (rev 11113)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/contrib/tools/sqldata_from_path.py 2013-04-30 03:24:33 UTC (rev 11114)
@@ -94,9 +94,9 @@
"bind_home_id" : "ADDRESSBOOK_HOME_RESOURCE_ID",
"bind_name" : "ADDRESSBOOK_RESOURCE_NAME",
- "bind_id" : "ADDRESSBOOK_RESOURCE_ID",
+ "bind_id" : "OWNER_ADDRESSBOOK_HOME_RESOURCE_ID",
- "object_bind_id" : "ADDRESSBOOK_RESOURCE_ID",
+ "object_bind_id" : "ADDRESSBOOK_HOME_RESOURCE_ID",
"object_name" : "RESOURCE_NAME",
"object_data" : "VCARD_TEXT",
},
Modified: CalendarServer/branches/users/gaya/sharedgroups-3/txdav/carddav/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/txdav/carddav/datastore/sql.py 2013-04-29 20:02:58 UTC (rev 11113)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/txdav/carddav/datastore/sql.py 2013-04-30 03:24:33 UTC (rev 11114)
@@ -82,7 +82,7 @@
self._childClass = AddressBook
super(AddressBookHome, self).__init__(transaction, ownerUID, notifiers)
- self._homeResourceID = None
+ self._homePropertyStoreID = None
self._addressbook = None
@@ -101,7 +101,7 @@
@classproperty
def _resourceIDAndHomeResourceIDFromOwnerQuery(cls): #@NoSelf
home = cls._homeSchema
- return Select([home.RESOURCE_ID, home.HOME_RESOURCE_ID],
+ return Select([home.RESOURCE_ID, home.PROPERTY_STORE_ID],
From=home, Where=home.OWNER_UID == Parameter("ownerUID"))
@@ -120,7 +120,7 @@
yield self._cacher.set(self._ownerUID, result)
if result:
- self._resourceID, self._homeResourceID = result[0]
+ self._resourceID, self._homePropertyStoreID = result[0]
queryCacher = self._txn._queryCacher
if queryCacher:
@@ -161,7 +161,7 @@
self.uid(),
self.uid(),
self._txn,
- self._homeResourceID, # not ._resourceID as in CommonHome._loadPropertyStore()
+ self._homePropertyStoreID, # not ._resourceID as in CommonHome._loadPropertyStore()
notifyCallback=self.notifyChanged
)
self._propertyStore = props
@@ -192,7 +192,7 @@
yield Delete(
From=rp,
Where=(rp.RESOURCE_ID == self._resourceID).Or(
- rp.RESOURCE_ID == self._homeResourceID
+ rp.RESOURCE_ID == self._homePropertyStoreID
)
).on(self._txn)
@@ -555,12 +555,12 @@
"""
obj = cls._objectSchema
return Select(columns, From=obj,
- Where=obj.ADDRESSBOOK_RESOURCE_ID == Parameter("addressbookResourceID"),)
+ Where=obj.ADDRESSBOOK_HOME_RESOURCE_ID == Parameter("addressbookResourceID"),)
def _fullySharedAddressBookGroupRow(self): #@NoSelf
return [
- self._resourceID, # obj.ADDRESSBOOK_RESOURCE_ID,
+ self._resourceID, # obj.ADDRESSBOOK_HOME_RESOURCE_ID,
self._resourceID, # obj.RESOURCE_ID,
self._fullySharedAddressBookGroupName(), # obj.RESOURCE_NAME, shared name is UID and thus avoids collisions
self._fullySharedAddressBookGroupUID(), # obj.UID, shared name is uuid
@@ -1502,7 +1502,7 @@
"""
obj = cls._objectSchema
return [
- obj.ADDRESSBOOK_RESOURCE_ID,
+ obj.ADDRESSBOOK_HOME_RESOURCE_ID,
obj.RESOURCE_ID,
obj.RESOURCE_NAME,
obj.UID,
@@ -1618,7 +1618,7 @@
abo = schema.ADDRESSBOOK_OBJECT
return Select([abo.RESOURCE_ID, abo.VCARD_UID],
From=abo,
- Where=((abo.ADDRESSBOOK_RESOURCE_ID == Parameter("addressbookResourceID")
+ Where=((abo.ADDRESSBOOK_HOME_RESOURCE_ID == Parameter("addressbookResourceID")
).And(
abo.VCARD_UID.In(Parameter("uids", len(uids))))),
)
@@ -1650,7 +1650,7 @@
abo = schema.ADDRESSBOOK_OBJECT
return Insert(
{abo.RESOURCE_ID: schema.RESOURCE_ID_SEQ,
- abo.ADDRESSBOOK_RESOURCE_ID: Parameter("addressbookResourceID"),
+ abo.ADDRESSBOOK_HOME_RESOURCE_ID: Parameter("addressbookResourceID"),
abo.RESOURCE_NAME: Parameter("name"),
abo.VCARD_TEXT: Parameter("text"),
abo.VCARD_UID: Parameter("uid"),
@@ -2286,7 +2286,7 @@
Where=(bind.BIND_STATUS == _BIND_STATUS_ACCEPTED)
.And(bind.RESOURCE_ID == abo.RESOURCE_ID)
.And(bind.HOME_RESOURCE_ID == Parameter("homeID"))
- .And(abo.ADDRESSBOOK_RESOURCE_ID == Parameter("addressbookID"))
+ .And(abo.ADDRESSBOOK_HOME_RESOURCE_ID == Parameter("addressbookID"))
)
@@ -2300,7 +2300,7 @@
Where=(bind.BIND_STATUS != _BIND_STATUS_ACCEPTED)
.And(bind.RESOURCE_ID == abo.RESOURCE_ID)
.And(bind.HOME_RESOURCE_ID == Parameter("homeID"))
- .And(abo.ADDRESSBOOK_RESOURCE_ID == Parameter("addressbookID"))
+ .And(abo.ADDRESSBOOK_HOME_RESOURCE_ID == Parameter("addressbookID"))
)
@@ -2313,7 +2313,7 @@
From=bind.join(abo),
Where=(bind.RESOURCE_ID == abo.RESOURCE_ID)
.And(bind.HOME_RESOURCE_ID == Parameter("homeID"))
- .And(abo.ADDRESSBOOK_RESOURCE_ID == Parameter("addressbookID"))
+ .And(abo.ADDRESSBOOK_HOME_RESOURCE_ID == Parameter("addressbookID"))
)
Modified: CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_legacy.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_legacy.py 2013-04-29 20:02:58 UTC (rev 11113)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_legacy.py 2013-04-30 03:24:33 UTC (rev 11114)
@@ -749,7 +749,7 @@
if self.calendarid:
# AND the whole thing
- test = expression.isExpression("ADDRESSBOOK_OBJECT.ADDRESSBOOK_RESOURCE_ID", str(self.calendarid), True)
+ test = expression.isExpression("ADDRESSBOOK_OBJECT.ADDRESSBOOK_HOME_RESOURCE_ID", str(self.calendarid), True)
self.expression = test.andWith(self.expression)
# Generate ' where ...' partial statement
@@ -861,7 +861,7 @@
[self._objectSchema.RESOURCE_NAME,
self._objectSchema.VCARD_UID],
From=self._objectSchema,
- Where=self._objectSchema.ADDRESSBOOK_RESOURCE_ID ==
+ Where=self._objectSchema.ADDRESSBOOK_HOME_RESOURCE_ID ==
self.addressbook._resourceID
).on(self.addressbook._txn)
Modified: CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_schema/current.sql
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_schema/current.sql 2013-04-29 20:02:58 UTC (rev 11113)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_schema/current.sql 2013-04-30 03:24:33 UTC (rev 11114)
@@ -341,10 +341,10 @@
----------------------
create table ADDRESSBOOK_HOME (
- RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
- HOME_RESOURCE_ID integer default nextval('RESOURCE_ID_SEQ') not null, -- implicit index
- OWNER_UID varchar(255) not null unique, -- implicit index
- DATAVERSION integer default 0 not null
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
+ PROPERTY_STORE_ID integer default nextval('RESOURCE_ID_SEQ') not null, -- implicit index
+ OWNER_UID varchar(255) not null unique, -- implicit index
+ DATAVERSION integer default 0 not null
);
@@ -367,19 +367,19 @@
-- Joins ADDRESSBOOK_HOME and ADDRESSBOOK_HOME
create table ADDRESSBOOK_BIND (
- ADDRESSBOOK_HOME_RESOURCE_ID integer not null references ADDRESSBOOK_HOME,
- ADDRESSBOOK_RESOURCE_ID integer not null references ADDRESSBOOK_HOME on delete cascade,
- ADDRESSBOOK_RESOURCE_NAME varchar(255) not null,
- BIND_MODE integer not null, -- enum CALENDAR_BIND_MODE
- BIND_STATUS integer not null, -- enum CALENDAR_BIND_STATUS
- MESSAGE text, -- FIXME: xml?
+ ADDRESSBOOK_HOME_RESOURCE_ID integer not null references ADDRESSBOOK_HOME,
+ OWNER_ADDRESSBOOK_HOME_RESOURCE_ID integer not null references ADDRESSBOOK_HOME on delete cascade,
+ ADDRESSBOOK_RESOURCE_NAME varchar(255) not null,
+ BIND_MODE integer not null, -- enum CALENDAR_BIND_MODE
+ BIND_STATUS integer not null, -- enum CALENDAR_BIND_STATUS
+ MESSAGE text, -- FIXME: xml?
- primary key (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID), -- implicit index
+ primary key (ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_ADDRESSBOOK_HOME_RESOURCE_ID), -- implicit index
unique (ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_NAME) -- implicit index
);
create index ADDRESSBOOK_BIND_RESOURCE_ID on
- ADDRESSBOOK_BIND(ADDRESSBOOK_RESOURCE_ID);
+ ADDRESSBOOK_BIND(OWNER_ADDRESSBOOK_HOME_RESOURCE_ID);
------------------------
@@ -387,18 +387,18 @@
------------------------
create table ADDRESSBOOK_OBJECT (
- RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
- ADDRESSBOOK_RESOURCE_ID integer not null references ADDRESSBOOK_HOME on delete cascade,
- RESOURCE_NAME varchar(255) not null,
- VCARD_TEXT text not null,
- VCARD_UID varchar(255) not null,
- KIND integer not null, -- enum OBJECT_KIND
- MD5 char(32) not null,
- CREATED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
- MODIFIED timestamp default timezone('UTC', CURRENT_TIMESTAMP),
+ RESOURCE_ID integer primary key default nextval('RESOURCE_ID_SEQ'), -- implicit index
+ ADDRESSBOOK_HOME_RESOURCE_ID integer not null references ADDRESSBOOK_HOME on delete cascade,
+ RESOURCE_NAME varchar(255) not null,
+ VCARD_TEXT text not null,
+ VCARD_UID varchar(255) not null,
+ KIND integer not null, -- enum OBJECT_KIND
+ 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), -- implicit index
- unique (ADDRESSBOOK_RESOURCE_ID, VCARD_UID) -- implicit index
+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, RESOURCE_NAME), -- implicit index
+ unique (ADDRESSBOOK_HOME_RESOURCE_ID, VCARD_UID) -- implicit index
);
@@ -493,22 +493,22 @@
----------------------------------
create table ADDRESSBOOK_OBJECT_REVISIONS (
- ADDRESSBOOK_HOME_RESOURCE_ID integer not null references ADDRESSBOOK_HOME,
- ADDRESSBOOK_RESOURCE_ID integer references ADDRESSBOOK_HOME,
- ADDRESSBOOK_NAME varchar(255) default null,
- RESOURCE_NAME varchar(255),
- REVISION integer default nextval('REVISION_SEQ') not null,
- DELETED boolean not null
+ ADDRESSBOOK_HOME_RESOURCE_ID integer not null references ADDRESSBOOK_HOME,
+ OWNER_ADDRESSBOOK_HOME_RESOURCE_ID integer references ADDRESSBOOK_HOME,
+ ADDRESSBOOK_NAME varchar(255) default null,
+ RESOURCE_NAME varchar(255),
+ REVISION integer default nextval('REVISION_SEQ') not null,
+ DELETED boolean not null
);
create index ADDRESSBOOK_OBJECT_REVISIONS_HOME_RESOURCE_ID_ADDRESSBOOK_RESOURCE_ID
- on ADDRESSBOOK_OBJECT_REVISIONS(ADDRESSBOOK_HOME_RESOURCE_ID, ADDRESSBOOK_RESOURCE_ID);
+ on ADDRESSBOOK_OBJECT_REVISIONS(ADDRESSBOOK_HOME_RESOURCE_ID, OWNER_ADDRESSBOOK_HOME_RESOURCE_ID);
create index ADDRESSBOOK_OBJECT_REVISIONS_RESOURCE_ID_RESOURCE_NAME
- on ADDRESSBOOK_OBJECT_REVISIONS(ADDRESSBOOK_RESOURCE_ID, RESOURCE_NAME);
+ on ADDRESSBOOK_OBJECT_REVISIONS(OWNER_ADDRESSBOOK_HOME_RESOURCE_ID, RESOURCE_NAME);
create index ADDRESSBOOK_OBJECT_REVISIONS_RESOURCE_ID_REVISION
- on ADDRESSBOOK_OBJECT_REVISIONS(ADDRESSBOOK_RESOURCE_ID, REVISION);
+ on ADDRESSBOOK_OBJECT_REVISIONS(OWNER_ADDRESSBOOK_HOME_RESOURCE_ID, REVISION);
-----------------------------------
Modified: CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_tables.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_tables.py 2013-04-29 20:02:58 UTC (rev 11113)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_tables.py 2013-04-30 03:24:33 UTC (rev 11114)
@@ -61,7 +61,7 @@
schema.ADDRESSBOOK_BIND.RESOURCE_NAME = \
schema.ADDRESSBOOK_BIND.ADDRESSBOOK_RESOURCE_NAME
schema.ADDRESSBOOK_BIND.RESOURCE_ID = \
- schema.ADDRESSBOOK_BIND.ADDRESSBOOK_RESOURCE_ID
+ schema.ADDRESSBOOK_BIND.OWNER_ADDRESSBOOK_HOME_RESOURCE_ID
schema.ADDRESSBOOK_BIND.HOME_RESOURCE_ID = \
schema.ADDRESSBOOK_BIND.ADDRESSBOOK_HOME_RESOURCE_ID
schema.GROUP_ADDRESSBOOK_BIND.RESOURCE_NAME = \
@@ -77,7 +77,7 @@
schema.CALENDAR_OBJECT_REVISIONS.COLLECTION_NAME = \
schema.CALENDAR_OBJECT_REVISIONS.CALENDAR_NAME
schema.ADDRESSBOOK_OBJECT_REVISIONS.RESOURCE_ID = \
- schema.ADDRESSBOOK_OBJECT_REVISIONS.ADDRESSBOOK_RESOURCE_ID
+ schema.ADDRESSBOOK_OBJECT_REVISIONS.OWNER_ADDRESSBOOK_HOME_RESOURCE_ID
schema.ADDRESSBOOK_OBJECT_REVISIONS.HOME_RESOURCE_ID = \
schema.ADDRESSBOOK_OBJECT_REVISIONS.ADDRESSBOOK_HOME_RESOURCE_ID
schema.ADDRESSBOOK_OBJECT_REVISIONS.COLLECTION_NAME = \
@@ -97,7 +97,7 @@
schema.ADDRESSBOOK_OBJECT.UID = \
schema.ADDRESSBOOK_OBJECT.VCARD_UID
schema.ADDRESSBOOK_OBJECT.PARENT_RESOURCE_ID = \
- schema.ADDRESSBOOK_OBJECT.ADDRESSBOOK_RESOURCE_ID
+ schema.ADDRESSBOOK_OBJECT.ADDRESSBOOK_HOME_RESOURCE_ID
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130429/a6177132/attachment-0001.html>
More information about the calendarserver-changes
mailing list