[CalendarServer-changes] [11164] CalendarServer/branches/users/gaya/sharedgroups-3
source_changes at macosforge.org
source_changes at macosforge.org
Fri May 10 14:09:02 PDT 2013
Revision: 11164
http://trac.calendarserver.org//changeset/11164
Author: gaya at apple.com
Date: 2013-05-10 14:09:01 -0700 (Fri, 10 May 2013)
Log Message:
-----------
checkpoint
Modified Paths:
--------------
CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/test/test_resource.py
CalendarServer/branches/users/gaya/sharedgroups-3/txdav/base/propertystore/sql.py
CalendarServer/branches/users/gaya/sharedgroups-3/txdav/carddav/datastore/test/test_sql.py
CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql.py
CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_schema/current-oracle-dialect.sql
CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_schema/current.sql
Modified: CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/test/test_resource.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/test/test_resource.py 2013-05-10 17:20:35 UTC (rev 11163)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/twistedcaldav/test/test_resource.py 2013-05-10 21:09:01 UTC (rev 11164)
@@ -188,7 +188,7 @@
@inlineCallbacks
def test_pick_default_addressbook(self):
"""
- Make calendar
+ Get adbk
"""
request = SimpleStoreRequest(self, "GET", "/addressbooks/users/wsanchez/", authid="wsanchez")
@@ -213,63 +213,13 @@
@inlineCallbacks
- def test_pick_default_other(self):
- """
- Make adbk
- """
-
- request = SimpleStoreRequest(self, "GET", "/addressbooks/users/wsanchez/", authid="wsanchez")
- home = yield request.locateResource("/addressbooks/users/wsanchez")
-
- # default property not present
- try:
- home.readDeadProperty(carddavxml.DefaultAddressBookURL)
- except HTTPError:
- pass
- else:
- self.fail("carddavxml.DefaultAddressBookURL is not empty")
-
- # Create a new default adbk
- newadbk = yield request.locateResource("/addressbooks/users/wsanchez/newadbk")
- yield newadbk.createAddressBookCollection()
- home.writeDeadProperty(carddavxml.DefaultAddressBookURL(
- HRef("/addressbooks/__uids__/6423F94A-6B76-4A3A-815B-D52CFD77935D/newadbk/")
- ))
-
- # Delete the normal adbk
- request = SimpleStoreRequest(self, "GET", "/addressbooks/users/wsanchez/", authid="wsanchez")
- home = yield request.locateResource("/addressbooks/users/wsanchez")
- adbk = yield request.locateResource("/addressbooks/users/wsanchez/addressbook")
- yield adbk.storeRemove(request)
-
- home.removeDeadProperty(carddavxml.DefaultAddressBookURL)
-
- # default property not present
- try:
- home.readDeadProperty(carddavxml.DefaultAddressBookURL)
- except HTTPError:
- pass
- else:
- self.fail("carddavxml.DefaultAddressBookURL is not empty")
-
- yield self.commit()
-
- request = SimpleStoreRequest(self, "GET", "/addressbooks/users/wsanchez/", authid="wsanchez")
- home = yield request.locateResource("/addressbooks/users/wsanchez")
- yield home.pickNewDefaultAddressBook(request)
-
- try:
- default = home.readDeadProperty(carddavxml.DefaultAddressBookURL)
- except HTTPError:
- self.fail("carddavxml.DefaultAddressBookURL is not present")
- else:
- self.assertEqual(str(default.children[0]), "/addressbooks/__uids__/6423F94A-6B76-4A3A-815B-D52CFD77935D/newadbk/")
-
-
- @inlineCallbacks
def test_fix_shared_default(self):
+ # I think this would include a test of http_GET()
+ raise NotImplementedError()
+ test_fix_shared_default.todo = "Rewrite with real shared address book"
+ '''
"""
- Make calendar
+ Get adbk
"""
request = SimpleStoreRequest(self, "GET", "/addressbooks/users/wsanchez/", authid="wsanchez")
@@ -297,3 +247,4 @@
self.fail("carddavxml.DefaultAddressBookURL is not present")
else:
self.assertEqual(str(default.children[0]), "/addressbooks/__uids__/6423F94A-6B76-4A3A-815B-D52CFD77935D/addressbook/")
+ '''
Modified: CalendarServer/branches/users/gaya/sharedgroups-3/txdav/base/propertystore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/txdav/base/propertystore/sql.py 2013-05-10 17:20:35 UTC (rev 11163)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/txdav/base/propertystore/sql.py 2013-05-10 21:09:01 UTC (rev 11164)
@@ -320,7 +320,6 @@
self._txn, resourceID=self._resourceID, value=value_str,
name=key_str, uid=uid)
-
# Reload from the DB
self._cached = {}
self._cacher.delete(str(self._resourceID))
Modified: CalendarServer/branches/users/gaya/sharedgroups-3/txdav/carddav/datastore/test/test_sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/txdav/carddav/datastore/test/test_sql.py 2013-05-10 17:20:35 UTC (rev 11163)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/txdav/carddav/datastore/test/test_sql.py 2013-05-10 21:09:01 UTC (rev 11164)
@@ -578,7 +578,7 @@
adbk1 = yield self.addressbookUnderTest()
name = "4.vcf"
component = VComponent.fromString(vcard4_text)
- addressobject = yield adbk1.createAddressBookObjectWithName(name, component, metadata={})
+ addressobject = yield adbk1.createAddressBookObjectWithName(name, component, options={})
resourceID = addressobject._resourceID
prop = schema.RESOURCE_PROPERTY
Modified: CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql.py
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql.py 2013-05-10 17:20:35 UTC (rev 11163)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql.py 2013-05-10 21:09:01 UTC (rev 11164)
@@ -2853,12 +2853,11 @@
result = []
for row in acceptedRows:
- bindMode, homeID, resourceID, bindName, bindStatus, bindMessage = row[6:] #@UnusedVariable
+ bindMode, homeID, resourceID, bindName, bindStatus, bindMessage = row[:6] #@UnusedVariable
home = yield self._txn.homeWithResourceID(self._home._homeType, homeID)
new = yield home.objectWithShareUID(bindName)
+ result.append(new)
- yield new.initFromStore()
- result.append(new)
returnValue(result)
@@ -3139,13 +3138,17 @@
dataRows = (yield cls._childrenAndMetadataForHomeID.on(home._txn, homeID=home._resourceID))
if dataRows:
- # Get property stores for all these child resources
+ # Get property stores
childResourceIDs = [dataRow[2] for dataRow in dataRows]
propertyStores = yield PropertyStore.forMultipleResourcesWithResourceIDs(
home.uid(), home._txn, childResourceIDs
)
+ print("loadAllObjects:%s dataRows=%s, childResourceID=%s, propertyStores=%s" % (cls, dataRows, childResourceIDs, propertyStores))
+
+ # Get revisions
revisions = (yield cls._revisionsForResourceIDs(childResourceIDs).on(home._txn, resourceIDs=childResourceIDs))
revisions = dict(revisions)
+ print("loadAllObjects:%s dataRows=%s, childResourceID=%s, revisions=%s" % (cls, dataRows, childResourceIDs, revisions))
# Create the actual objects merging in properties
for items in dataRows:
@@ -3221,7 +3224,7 @@
bindMode, homeID, resourceID, bindName, bindStatus, bindMessage = row[:6] #@UnusedVariable
if (bindStatus == _BIND_STATUS_ACCEPTED) != bool(accepted):
returnValue(None)
- additionalBind = row [8:]
+ additionalBind = row[6:6 + len(cls.additionalBindColumns())]
if bindMode == _BIND_MODE_OWN:
ownerHome = home
Modified: CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_schema/current-oracle-dialect.sql
===================================================================
--- CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2013-05-10 17:20:35 UTC (rev 11163)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_schema/current-oracle-dialect.sql 2013-05-10 21:09:01 UTC (rev 11164)
@@ -348,7 +348,7 @@
insert into CALENDARSERVER (NAME, VALUE) values ('VERSION', '20');
insert into CALENDARSERVER (NAME, VALUE) values ('CALENDAR-DATAVERSION', '4');
-insert into CALENDARSERVER (NAME, VALUE) values ('ADDRESSBOOK-DATAVERSION', '3');
+insert into CALENDARSERVER (NAME, VALUE) values ('ADDRESSBOOK-DATAVERSION', '2');
create index NOTIFICATION_NOTIFICA_f891f5f9 on NOTIFICATION (
NOTIFICATION_HOME_RESOURCE_ID
);
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-05-10 17:20:35 UTC (rev 11163)
+++ CalendarServer/branches/users/gaya/sharedgroups-3/txdav/common/datastore/sql_schema/current.sql 2013-05-10 21:09:01 UTC (rev 11164)
@@ -651,4 +651,4 @@
insert into CALENDARSERVER values ('VERSION', '20');
insert into CALENDARSERVER values ('CALENDAR-DATAVERSION', '4');
-insert into CALENDARSERVER values ('ADDRESSBOOK-DATAVERSION', '3');
+insert into CALENDARSERVER values ('ADDRESSBOOK-DATAVERSION', '2');
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20130510/bbe6f5dd/attachment-0001.html>
More information about the calendarserver-changes
mailing list