Query order enforcement & other minor checks.

This commit is contained in:
Andrew McMillan 2010-03-21 22:00:12 +13:00
parent 75ebf3649d
commit 028481d917
6 changed files with 19 additions and 5 deletions

View File

@ -7,3 +7,8 @@ Content-Type: text/xml; charset="utf-8"
<?xml version="1.0" encoding="utf-8" ?>
<multistatus xmlns="DAV:"/>
dav_displayname: >User 1 Inbox<
dav_name: >/user1/.in/<
parent_container: >/user1/<

View File

@ -25,3 +25,9 @@ BEGINDATA
</filter>
</calendar-query>
ENDDATA
QUERY
SELECT dav_name, dav_displayname, parent_container
FROM collection
WHERE dav_name = '/user1/.in/'
ENDQUERY

View File

@ -52,5 +52,6 @@ SELECT by_principal, by_collection, privileges, p_to.displayname, to_principal
LEFT JOIN collection ON (by_collection=collection.collection_id)
LEFT JOIN dav_principal p_by ON (by_principal=p_by.principal_id)
WHERE p_by.username = 'user1'
ORDER BY by_principal, to_principal
ENDQUERY

View File

@ -38,5 +38,6 @@ SELECT by_principal, by_collection, privileges, p_to.displayname, to_principal
LEFT JOIN collection ON (by_collection=collection.collection_id)
LEFT JOIN dav_principal p_by ON (by_principal=p_by.principal_id)
WHERE p_by.dav_name = '/user1/'
ORDER BY by_principal, to_principal
ENDQUERY

View File

@ -6,13 +6,13 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
dav_etag: >9a8d7696ee2e0a0f1f4170fe4f094a3a<
dav_name: >/user2/home/thiswillworkfine.ics<
dtstart: >2010-03-22 18:00:00+13<
summary: >Test adding an event to a bound collection<
dav_etag: >1c7895f11787e71fd6dbe3260d72d4a0<
dav_name: >/user2/home/thiswillalsobegood.ics<
dtstart: >2004-01-01 12:00:00+13<
summary: >Release DAViCal 0.9.9<
dav_etag: >9a8d7696ee2e0a0f1f4170fe4f094a3a<
dav_name: >/user2/home/thiswillworkfine.ics<
dtstart: >2010-03-22 18:00:00+13<
summary: >Test adding an event to a bound collection<

View File

@ -49,6 +49,7 @@ QUERY
SELECT caldav_data.dav_name, caldav_data.dav_etag, dtstart, summary
FROM caldav_data JOIN calendar_item USING(dav_name)
WHERE caldav_data.dav_name ~ '/user2/.*thiswill'
ORDER BY dav_etag
ENDQUERY