diff --git a/testing/tests/binding/1000-BIND.result b/testing/tests/binding/1000-BIND.result
index 50a8c393..83a5a805 100644
--- a/testing/tests/binding/1000-BIND.result
+++ b/testing/tests/binding/1000-BIND.result
@@ -7,7 +7,7 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
- bind_id: >1434<
+ bind_id: >1437<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/user2/<
diff --git a/testing/tests/binding/1001-BIND.result b/testing/tests/binding/1001-BIND.result
index 094a31f5..99d5fb1d 100644
--- a/testing/tests/binding/1001-BIND.result
+++ b/testing/tests/binding/1001-BIND.result
@@ -9,7 +9,7 @@ Content-Type: text/xml; charset="utf-8"
A resource already exists at the destination.
- bind_id: >1434<
+ bind_id: >1437<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/user2/<
diff --git a/testing/tests/binding/1004-PROPFIND-bound.result b/testing/tests/binding/1004-PROPFIND-bound.result
index f08dbc2b..3a07021f 100644
--- a/testing/tests/binding/1004-PROPFIND-bound.result
+++ b/testing/tests/binding/1004-PROPFIND-bound.result
@@ -58,6 +58,24 @@
HTTP/1.1 200 OK
+
+ /caldav.php/user4/.out/
+
+
+ User 4 Outbox
+
+ /caldav.php/.resources/1435
+
+
+
+ /caldav.php
+ user4
+
+
+
+ HTTP/1.1 200 OK
+
+
/caldav.php/user4/calendar-proxy-read/
diff --git a/testing/tests/binding/1012-BIND.result b/testing/tests/binding/1012-BIND.result
index ac37c450..efcf5a5e 100644
--- a/testing/tests/binding/1012-BIND.result
+++ b/testing/tests/binding/1012-BIND.result
@@ -7,14 +7,14 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
- bind_id: >1434<
+ bind_id: >1437<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
parent_container: >/user4/<
ticket_id_length: >8<
- bind_id: >1435<
+ bind_id: >1438<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
diff --git a/testing/tests/binding/1022-BIND.result b/testing/tests/binding/1022-BIND.result
index 08a66265..9cfaeab1 100644
--- a/testing/tests/binding/1022-BIND.result
+++ b/testing/tests/binding/1022-BIND.result
@@ -7,21 +7,21 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
- bind_id: >1434<
+ bind_id: >1437<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
- bind_id: >1435<
+ bind_id: >1438<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
- bind_id: >1439<
+ bind_id: >1442<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
diff --git a/testing/tests/binding/1023-BIND.result b/testing/tests/binding/1023-BIND.result
index d0635cab..19653b52 100644
--- a/testing/tests/binding/1023-BIND.result
+++ b/testing/tests/binding/1023-BIND.result
@@ -7,28 +7,28 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
- bind_id: >1434<
+ bind_id: >1437<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
- bind_id: >1435<
+ bind_id: >1438<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
- bind_id: >1439<
+ bind_id: >1442<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
length: >8<
parent_container: >/user4/base/<
- bind_id: >1440<
+ bind_id: >1443<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<
diff --git a/testing/tests/binding/1024-BIND.result b/testing/tests/binding/1024-BIND.result
index 39feec28..d05c4847 100644
--- a/testing/tests/binding/1024-BIND.result
+++ b/testing/tests/binding/1024-BIND.result
@@ -9,28 +9,28 @@ Content-Type: text/xml; charset="utf-8"
A resource already exists at the destination.
- bind_id: >1434<
+ bind_id: >1437<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
- bind_id: >1435<
+ bind_id: >1438<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
- bind_id: >1439<
+ bind_id: >1442<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
length: >8<
parent_container: >/user4/base/<
- bind_id: >1440<
+ bind_id: >1443<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<
diff --git a/testing/tests/binding/1025-PROPFIND.result b/testing/tests/binding/1025-PROPFIND.result
index 0cebf093..7b05081b 100644
--- a/testing/tests/binding/1025-PROPFIND.result
+++ b/testing/tests/binding/1025-PROPFIND.result
@@ -6,7 +6,7 @@
A normal collection
- /caldav.php/.resources/1437
+ /caldav.php/.resources/1440
@@ -90,7 +90,7 @@
A sub collection
- /caldav.php/.resources/1438
+ /caldav.php/.resources/1441
diff --git a/testing/tests/binding/1027-PROPFIND.result b/testing/tests/binding/1027-PROPFIND.result
index 6734b9bd..588842c0 100644
--- a/testing/tests/binding/1027-PROPFIND.result
+++ b/testing/tests/binding/1027-PROPFIND.result
@@ -6,7 +6,7 @@
A normal collection
- /caldav.php/.resources/1437
+ /caldav.php/.resources/1440
diff --git a/testing/tests/binding/1032-BIND-admin.result b/testing/tests/binding/1032-BIND-admin.result
index 4f055a61..1c58adb4 100644
--- a/testing/tests/binding/1032-BIND-admin.result
+++ b/testing/tests/binding/1032-BIND-admin.result
@@ -7,7 +7,7 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
- bind_id: >1434<
+ bind_id: >1437<
bind_owner: >6<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
@@ -19,7 +19,7 @@ target_collection: >11<
target_resource_i: >NULL<
ticket_owner: >4<
- bind_id: >1435<
+ bind_id: >1438<
bind_owner: >6<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
@@ -31,7 +31,7 @@ target_collection: >10<
target_resource_i: >NULL<
ticket_owner: >3<
- bind_id: >1439<
+ bind_id: >1442<
bind_owner: >6<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
@@ -43,7 +43,7 @@ target_collection: >10<
target_resource_i: >NULL<
ticket_owner: >3<
- bind_id: >1440<
+ bind_id: >1443<
bind_owner: >6<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
@@ -55,7 +55,7 @@ target_collection: >11<
target_resource_i: >NULL<
ticket_owner: >4<
- bind_id: >1453<
+ bind_id: >1456<
bind_owner: >1<
bound_source_id: >12<
dav_displayname: >user3 home<
diff --git a/testing/tests/binding/1034-DELETE-admin-bind.result b/testing/tests/binding/1034-DELETE-admin-bind.result
index 19df18b0..c9d88612 100644
--- a/testing/tests/binding/1034-DELETE-admin-bind.result
+++ b/testing/tests/binding/1034-DELETE-admin-bind.result
@@ -6,14 +6,14 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
- bind_id: >1439<
+ bind_id: >1442<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
dav_owner_id: >6<
parent_container: >/user4/base/<
- bind_id: >1440<
+ bind_id: >1443<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<
diff --git a/testing/tests/binding/1100-BIND.result b/testing/tests/binding/1100-BIND.result
index 1ec04d01..73470a0f 100644
--- a/testing/tests/binding/1100-BIND.result
+++ b/testing/tests/binding/1100-BIND.result
@@ -7,36 +7,36 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
- bind_id: >1434<
+ bind_id: >1437<
bound_source_id: >11<
dav_displayname: >Updated Displayname with PROPPATCH<
dav_name: >/user4/user2/<
length: >8<
parent_container: >/user4/<
- bind_id: >1435<
+ bind_id: >1438<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/user1/<
length: >8<
parent_container: >/user4/<
- bind_id: >1439<
+ bind_id: >1442<
bound_source_id: >10<
dav_displayname: >User 1's Calendaranza<
dav_name: >/user4/base/user1/<
length: >8<
parent_container: >/user4/base/<
- bind_id: >1440<
+ bind_id: >1443<
bound_source_id: >11<
dav_displayname: >User 2's Calendar, as uploaded by Admin<
dav_name: >/user4/base/user2/<
length: >8<
parent_container: >/user4/base/<
- bind_id: >1454<
- bound_source_id: >1437<
+ bind_id: >1457<
+ bound_source_id: >1440<
dav_displayname: >A normal collection<
dav_name: >/user4/boundbase/<
length: >NULL<
diff --git a/testing/tests/binding/1101-PROPFIND-normal.result b/testing/tests/binding/1101-PROPFIND-normal.result
index d719614e..812efa58 100644
--- a/testing/tests/binding/1101-PROPFIND-normal.result
+++ b/testing/tests/binding/1101-PROPFIND-normal.result
@@ -6,7 +6,7 @@
A normal collection
- /caldav.php/.resources/1437
+ /caldav.php/.resources/1440
@@ -90,7 +90,7 @@
A sub collection
- /caldav.php/.resources/1438
+ /caldav.php/.resources/1441
@@ -112,7 +112,7 @@
newcalendar
- /caldav.php/.resources/1443
+ /caldav.php/.resources/1446
diff --git a/testing/tests/binding/1102-PROPFIND-bound.result b/testing/tests/binding/1102-PROPFIND-bound.result
index 851a7142..a4aa2da1 100644
--- a/testing/tests/binding/1102-PROPFIND-bound.result
+++ b/testing/tests/binding/1102-PROPFIND-bound.result
@@ -6,7 +6,7 @@
A normal collection
- /caldav.php/.resources/1437
+ /caldav.php/.resources/1440
@@ -99,7 +99,7 @@
A sub collection
- /caldav.php/.resources/1438
+ /caldav.php/.resources/1441
@@ -125,7 +125,7 @@
newcalendar
- /caldav.php/.resources/1443
+ /caldav.php/.resources/1446
diff --git a/testing/tests/binding/Restore-Database.result b/testing/tests/binding/Restore-Database.result
index 22e37b06..a10decc8 100644
--- a/testing/tests/binding/Restore-Database.result
+++ b/testing/tests/binding/Restore-Database.result
@@ -1,6 +1,6 @@
setval
--------
- 1433
+ 1436
(1 row)
setval
diff --git a/testing/tests/carddav/Restore-Database.result b/testing/tests/carddav/Restore-Database.result
index 4a6b448d..ff40f9ce 100644
--- a/testing/tests/carddav/Restore-Database.result
+++ b/testing/tests/carddav/Restore-Database.result
@@ -1,6 +1,6 @@
setval
--------
- 1454
+ 1457
(1 row)
setval
diff --git a/testing/tests/regression-suite/0244-Moz-POST-FB.result b/testing/tests/regression-suite/0244-Moz-POST-FB.result
index a9a62295..03b788a8 100644
--- a/testing/tests/regression-suite/0244-Moz-POST-FB.result
+++ b/testing/tests/regression-suite/0244-Moz-POST-FB.result
@@ -37,18 +37,22 @@ END:VCALENDAR
+ class: >PUBLIC<
finish: >20081019T223000Z<
rrule: >FREQ=DAILY;INTERVAL=1;BYDAY=MO,WE,FR<
start: >20081019T220000Z<
+ class: >PUBLIC<
finish: >20081019T210000Z<
rrule: >FREQ=WEEKLY;INTERVAL=1<
start: >20081019T200000Z<
+ class: >PUBLIC<
finish: >20081024T020000Z<
rrule: >FREQ=WEEKLY;INTERVAL=1<
start: >20081024T010000Z<
+ class: >PUBLIC<
finish: >20081007T070000Z<
rrule: >FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1<
start: >20081006T070000Z<
diff --git a/testing/tests/regression-suite/0244-Moz-POST-FB.test b/testing/tests/regression-suite/0244-Moz-POST-FB.test
index 98449a83..01955e4c 100644
--- a/testing/tests/regression-suite/0244-Moz-POST-FB.test
+++ b/testing/tests/regression-suite/0244-Moz-POST-FB.test
@@ -33,7 +33,8 @@ ENDDATA
QUERY
SELECT calendar_item.rrule,
to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS start,
- to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS finish
+ to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS finish,
+ class
FROM usr INNER JOIN collection USING (user_no)
INNER JOIN caldav_data USING (collection_id)
INNER JOIN calendar_item USING(dav_id)
@@ -43,6 +44,5 @@ WHERE lower(usr.email) = 'user2@example.net'
AND caldav_data.caldav_type IN ( 'VEVENT', 'VFREEBUSY' )
AND (calendar_item.transp != 'TRANSPARENT' OR calendar_item.transp IS NULL)
AND (calendar_item.status != 'CANCELLED' OR calendar_item.status IS NULL)
- AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL)
ORDER BY dav_id
ENDQUERY
diff --git a/testing/tests/regression-suite/0245-Moz-POST-FB.result b/testing/tests/regression-suite/0245-Moz-POST-FB.result
index 236d41fc..0f3c8a54 100644
--- a/testing/tests/regression-suite/0245-Moz-POST-FB.result
+++ b/testing/tests/regression-suite/0245-Moz-POST-FB.result
@@ -39,6 +39,7 @@ END:VCALENDAR
a) Start: >20081024T054500Z<
b) Finish: >20081024T083000Z<
c) RRule: >FREQ=MONTHLY;INTERVAL=1;BYDAY=TU,FR<
+ class: >PUBLIC<
d) Start: >2008-10-24 08:45:00<
status: >NULL<
tz_locn: >Europe/Helsinki<
diff --git a/testing/tests/regression-suite/0245-Moz-POST-FB.test b/testing/tests/regression-suite/0245-Moz-POST-FB.test
index f862cbc8..a234379c 100644
--- a/testing/tests/regression-suite/0245-Moz-POST-FB.test
+++ b/testing/tests/regression-suite/0245-Moz-POST-FB.test
@@ -38,7 +38,8 @@ SELECT calendar_item.rrule AS "c) RRule", calendar_item.status,
to_char(calendar_item.dtstart at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "a) Start",
to_char(calendar_item.dtend at time zone 'GMT','YYYYMMDD"T"HH24MISS"Z"') AS "b) Finish",
calendar_item.dtstart at time zone tz_locn AS "d) Start",
- time_zone.tz_locn
+ time_zone.tz_locn,
+ class
FROM caldav_data INNER JOIN calendar_item USING(dav_id,user_no,dav_name,collection_id)
INNER JOIN collection USING(collection_id)
LEFT JOIN time_zone USING( tz_id )
@@ -49,5 +50,4 @@ SELECT calendar_item.rrule AS "c) RRule", calendar_item.status,
AND (calendar_item.status != 'CANCELLED' OR calendar_item.status IS NULL)
AND collection.is_calendar
AND collection.schedule_transp = 'opaque'
- AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL)
ENDQUERY
diff --git a/testing/tests/regression-suite/0902-PUT-collection.result b/testing/tests/regression-suite/0902-PUT-collection.result
index d65e15ed..98e5bff9 100644
--- a/testing/tests/regression-suite/0902-PUT-collection.result
+++ b/testing/tests/regression-suite/0902-PUT-collection.result
@@ -16,7 +16,7 @@ Content-Type: text/plain; charset="utf-8"
attendees: >40<
- collection_id: >1400<
+ collection_id: >1402<
dav_displayname: >anotherone<
dav_etag: >f9a8ee6b41d9b02aa5176e6da349121a<
dav_name: >/user1/anotherone/<
diff --git a/testing/tests/regression-suite/0902-PUT-collection.test b/testing/tests/regression-suite/0902-PUT-collection.test
index e815bc79..a0420677 100644
--- a/testing/tests/regression-suite/0902-PUT-collection.test
+++ b/testing/tests/regression-suite/0902-PUT-collection.test
@@ -406,9 +406,9 @@ END:VEVENT
BEGIN:VEVENT
UID:20060803T084628Z-6040-1000-1-6@lamb
DTSTAMP:20060803T084628Z
-DTSTART;VALUE=DATE:20060801
-DTEND;VALUE=DATE:20060802
-SUMMARY:Steve's Birthday
+DTSTART:20060801T123456
+DTEND:20060802T123456
+SUMMARY:Steve's Private Birthday
CREATED:20060803T084628
LAST-MODIFIED:20060803T084657
CLASS:PRIVATE
diff --git a/testing/tests/regression-suite/0903-GET-Collection.result b/testing/tests/regression-suite/0903-GET-Collection.result
index 70d2ac0f..b5cbaf89 100644
--- a/testing/tests/regression-suite/0903-GET-Collection.result
+++ b/testing/tests/regression-suite/0903-GET-Collection.result
@@ -402,9 +402,9 @@ END:VEVENT
BEGIN:VEVENT
UID:20060803T084628Z-6040-1000-1-6@lamb
DTSTAMP:20060803T084628Z
-DTSTART;VALUE=DATE:20060801
-DTEND;VALUE=DATE:20060802
-SUMMARY:Steve's Birthday
+DTSTART:20060801T123456
+DTEND:20060802T123456
+SUMMARY:Steve's Private Birthday
CREATED:20060803T084628
LAST-MODIFIED:20060803T084657
CLASS:PRIVATE
diff --git a/testing/tests/regression-suite/0924-MOVE.result b/testing/tests/regression-suite/0924-MOVE.result
index a0f0f813..779bf750 100644
--- a/testing/tests/regression-suite/0924-MOVE.result
+++ b/testing/tests/regression-suite/0924-MOVE.result
@@ -6,9 +6,9 @@ Content-Length: 0
Content-Type: text/plain; charset="utf-8"
- cd_collection: >1400<
+ cd_collection: >1402<
cd_user_no: >10<
- ci_collection: >1400<
+ ci_collection: >1402<
ci_user_no: >10<
data_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
item_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
diff --git a/testing/tests/regression-suite/0950-MKTICKET.result b/testing/tests/regression-suite/0950-MKTICKET.result
index 1a92be19..3e052db4 100644
--- a/testing/tests/regression-suite/0950-MKTICKET.result
+++ b/testing/tests/regression-suite/0950-MKTICKET.result
@@ -39,6 +39,6 @@ target_resource_i: >NULL<
dav_owner_id: >3<
privileges: >000000000001001011100111<
target_collection: >10<
-target_resource_i: >1367<
+target_resource_i: >1369<
timeout: >1 day<
diff --git a/testing/tests/regression-suite/0951-MKTICKET.result b/testing/tests/regression-suite/0951-MKTICKET.result
index 266a12a5..4720d397 100644
--- a/testing/tests/regression-suite/0951-MKTICKET.result
+++ b/testing/tests/regression-suite/0951-MKTICKET.result
@@ -19,6 +19,6 @@ target_resource_i: >NULL<
dav_owner_id: >3<
privileges: >000000000001001011100111<
target_collection: >10<
-target_resource_i: >1367<
+target_resource_i: >1369<
timeout: >24:00:00<