From dbd73d94aa55cab9bad352d8797e213810bfd221 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Sun, 29 Mar 2009 21:23:42 +1300
Subject: [PATCH] Use the parsed timezone in the regression tests.

---
 .../000-Setup-PUT-collection-user3.result            |  8 ++++----
 .../000-Setup-PUT-collection-user3.test              |  4 ++--
 .../000-Setup-PUT-collection-user6.result            |  8 ++++----
 .../000-Setup-PUT-collection-user6.test              |  4 ++--
 .../regression-suite/000-Setup-PUT-collection.result | 12 ++++++------
 .../regression-suite/000-Setup-PUT-collection.test   |  4 ++--
 .../tests/regression-suite/010-Mulberry-PUT-1.result |  4 ++--
 .../tests/regression-suite/010-Mulberry-PUT-1.test   |  4 ++--
 .../regression-suite/011-Mulberry-PUT-1b.result      |  4 ++--
 .../tests/regression-suite/011-Mulberry-PUT-1b.test  |  4 ++--
 testing/tests/regression-suite/233-Moz-PUT.result    |  4 ++--
 testing/tests/regression-suite/233-Moz-PUT.test      |  4 ++--
 testing/tests/regression-suite/234-Moz-PUT.result    |  4 ++--
 testing/tests/regression-suite/234-Moz-PUT.test      |  4 ++--
 testing/tests/regression-suite/505-iCal-PUT.result   |  4 ++--
 testing/tests/regression-suite/505-iCal-PUT.test     |  4 ++--
 testing/tests/regression-suite/506-iCal-PUT.result   |  4 ++--
 testing/tests/regression-suite/506-iCal-PUT.test     |  4 ++--
 testing/tests/regression-suite/512-iCal-PUT.result   |  4 ++--
 testing/tests/regression-suite/512-iCal-PUT.test     |  4 ++--
 testing/tests/regression-suite/513-iCal-PUT.result   |  4 ++--
 testing/tests/regression-suite/513-iCal-PUT.test     |  4 ++--
 .../tests/regression-suite/514-iCal-PUT-VTODO.result |  4 ++--
 .../tests/regression-suite/514-iCal-PUT-VTODO.test   |  4 ++--
 .../regression-suite/515-iCal-PUT-VEVENT.result      |  4 ++--
 .../tests/regression-suite/804-Mulberry-PUT-1.test   |  4 ++--
 testing/tests/regression-suite/817-Spec-PUT.result   |  4 ++--
 testing/tests/regression-suite/817-Spec-PUT.test     |  4 ++--
 testing/tests/regression-suite/818-Spec-PUT.result   |  4 ++--
 testing/tests/regression-suite/818-Spec-PUT.test     |  4 ++--
 .../tests/regression-suite/Create-Database.result    |  1 +
 31 files changed, 69 insertions(+), 68 deletions(-)

diff --git a/testing/tests/regression-suite/000-Setup-PUT-collection-user3.result b/testing/tests/regression-suite/000-Setup-PUT-collection-user3.result
index 19497e0e..066ee102 100644
--- a/testing/tests/regression-suite/000-Setup-PUT-collection-user3.result
+++ b/testing/tests/regression-suite/000-Setup-PUT-collection-user3.result
@@ -43,9 +43,9 @@ END:VCALENDAR
       caldav_type: >VEVENT<
             class: >PUBLIC<
       description: >NULL<
-            dtend: >2008-10-25 14:30:00+13<
+            dtend: >2008-10-25 14:30:00<
           dtstamp: >2008-10-24 20:07:45<
-          dtstart: >2008-10-25 13:30:00+13<
+          dtstart: >2008-10-25 13:30:00<
               due: >NULL<
          location: >NULL<
       logged_user: >12<
@@ -97,9 +97,9 @@ END:VCALENDAR
       caldav_type: >VEVENT<
             class: >PUBLIC<
       description: >NULL<
-            dtend: >2008-10-24 11:30:00+13<
+            dtend: >2008-10-24 11:30:00<
           dtstamp: >2008-10-25 11:26:53<
-          dtstart: >2008-10-24 08:45:00+13<
+          dtstart: >2008-10-24 08:45:00<
               due: >NULL<
          location: >NULL<
       logged_user: >12<
diff --git a/testing/tests/regression-suite/000-Setup-PUT-collection-user3.test b/testing/tests/regression-suite/000-Setup-PUT-collection-user3.test
index aaab7d77..3609c4c6 100644
--- a/testing/tests/regression-suite/000-Setup-PUT-collection-user3.test
+++ b/testing/tests/regression-suite/000-Setup-PUT-collection-user3.test
@@ -61,11 +61,11 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart, dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS "A1 CalDAV DATA"
-FROM caldav_data JOIN calendar_item USING(dav_name)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
 WHERE caldav_data.dav_name ~ '^/user3/home/'
 ENDQUERY
 
diff --git a/testing/tests/regression-suite/000-Setup-PUT-collection-user6.result b/testing/tests/regression-suite/000-Setup-PUT-collection-user6.result
index f77d58f1..1e355bb2 100644
--- a/testing/tests/regression-suite/000-Setup-PUT-collection-user6.result
+++ b/testing/tests/regression-suite/000-Setup-PUT-collection-user6.result
@@ -43,9 +43,9 @@ END:VCALENDAR
       caldav_type: >VEVENT<
             class: >PUBLIC<
       description: >NULL<
-            dtend: >2008-10-25 14:30:00+13<
+            dtend: >2008-10-25 14:30:00<
           dtstamp: >2008-10-24 20:07:45<
-          dtstart: >2008-10-25 13:30:00+13<
+          dtstart: >2008-10-25 13:30:00<
               due: >NULL<
          location: >NULL<
       logged_user: >15<
@@ -97,9 +97,9 @@ END:VCALENDAR
       caldav_type: >VEVENT<
             class: >PUBLIC<
       description: >NULL<
-            dtend: >2008-10-24 11:30:00+13<
+            dtend: >2008-10-24 11:30:00<
           dtstamp: >2008-10-25 11:26:53<
-          dtstart: >2008-10-24 08:45:00+13<
+          dtstart: >2008-10-24 08:45:00<
               due: >NULL<
          location: >NULL<
       logged_user: >15<
diff --git a/testing/tests/regression-suite/000-Setup-PUT-collection-user6.test b/testing/tests/regression-suite/000-Setup-PUT-collection-user6.test
index a4d29963..df2e4531 100644
--- a/testing/tests/regression-suite/000-Setup-PUT-collection-user6.test
+++ b/testing/tests/regression-suite/000-Setup-PUT-collection-user6.test
@@ -61,11 +61,11 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart, dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS "A1 CalDAV DATA"
-FROM caldav_data JOIN calendar_item USING(dav_name)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
 WHERE caldav_data.dav_name ~ '^/User Six/home/'
 ENDQUERY
 
diff --git a/testing/tests/regression-suite/000-Setup-PUT-collection.result b/testing/tests/regression-suite/000-Setup-PUT-collection.result
index dbab1fef..96b21897 100644
--- a/testing/tests/regression-suite/000-Setup-PUT-collection.result
+++ b/testing/tests/regression-suite/000-Setup-PUT-collection.result
@@ -44,9 +44,9 @@ END:VCALENDAR
       caldav_type: >VEVENT<
             class: >PUBLIC<
       description: >NULL<
-            dtend: >2008-10-20 11:30:00+13<
+            dtend: >2008-10-20 11:30:00<
           dtstamp: >2008-10-23 05:49:58<
-          dtstart: >2008-10-20 11:00:00+13<
+          dtstart: >2008-10-20 11:00:00<
               due: >NULL<
          location: >NULL<
       logged_user: >11<
@@ -99,9 +99,9 @@ END:VCALENDAR
       caldav_type: >VEVENT<
             class: >PUBLIC<
       description: >NULL<
-            dtend: >2008-10-20 10:00:00+13<
+            dtend: >2008-10-20 10:00:00<
           dtstamp: >2008-10-23 05:49:34<
-          dtstart: >2008-10-20 09:00:00+13<
+          dtstart: >2008-10-20 09:00:00<
               due: >NULL<
          location: >NULL<
       logged_user: >11<
@@ -154,9 +154,9 @@ END:VCALENDAR
       caldav_type: >VEVENT<
             class: >PUBLIC<
       description: >NULL<
-            dtend: >2008-10-24 15:00:00+13<
+            dtend: >2008-10-24 15:00:00<
           dtstamp: >2008-10-23 05:51:15<
-          dtstart: >2008-10-24 14:00:00+13<
+          dtstart: >2008-10-24 14:00:00<
               due: >NULL<
          location: >NULL<
       logged_user: >11<
diff --git a/testing/tests/regression-suite/000-Setup-PUT-collection.test b/testing/tests/regression-suite/000-Setup-PUT-collection.test
index 2b78712c..1fe1a715 100644
--- a/testing/tests/regression-suite/000-Setup-PUT-collection.test
+++ b/testing/tests/regression-suite/000-Setup-PUT-collection.test
@@ -71,11 +71,11 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart, dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS "A1 CalDAV DATA"
-FROM caldav_data JOIN calendar_item USING(dav_name)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
 WHERE caldav_data.dav_name ~ '^/user2/home/'
 ENDQUERY
 
diff --git a/testing/tests/regression-suite/010-Mulberry-PUT-1.result b/testing/tests/regression-suite/010-Mulberry-PUT-1.result
index adbd56b9..1b91cd28 100644
--- a/testing/tests/regression-suite/010-Mulberry-PUT-1.result
+++ b/testing/tests/regression-suite/010-Mulberry-PUT-1.result
@@ -41,9 +41,9 @@ END:VCALENDAR
       caldav_type: >VEVENT<
             class: >PUBLIC<
       description: >NULL<
-            dtend: >2006-10-25 10:15:00+13<
+            dtend: >2006-10-25 10:15:00<
           dtstamp: >2006-10-25 10:13:27<
-          dtstart: >2006-10-25 09:15:00+13<
+          dtstart: >2006-10-25 09:15:00<
               due: >NULL<
          location: >NULL<
       logged_user: >10<
diff --git a/testing/tests/regression-suite/010-Mulberry-PUT-1.test b/testing/tests/regression-suite/010-Mulberry-PUT-1.test
index dfb44760..79546fb1 100644
--- a/testing/tests/regression-suite/010-Mulberry-PUT-1.test
+++ b/testing/tests/regression-suite/010-Mulberry-PUT-1.test
@@ -42,12 +42,12 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart, dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now",
        caldav_data AS "A1 CalDAV DATA"
-FROM caldav_data JOIN calendar_item USING(dav_name)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
 WHERE caldav_data.dav_name ~ '^/user1/home/'
 ENDQUERY
 
diff --git a/testing/tests/regression-suite/011-Mulberry-PUT-1b.result b/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
index 4b74f67d..b5cef2e3 100644
--- a/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
+++ b/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
@@ -41,9 +41,9 @@ END:VCALENDAR
       caldav_type: >VEVENT<
             class: >PUBLIC<
       description: >NULL<
-            dtend: >2006-10-25 10:15:00+13<
+            dtend: >2006-10-25 10:15:00<
           dtstamp: >2006-10-25 10:13:27<
-          dtstart: >2006-10-25 09:15:00+13<
+          dtstart: >2006-10-25 09:15:00<
               due: >NULL<
          location: >NULL<
       logged_user: >10<
diff --git a/testing/tests/regression-suite/011-Mulberry-PUT-1b.test b/testing/tests/regression-suite/011-Mulberry-PUT-1b.test
index c80e9cc4..7a7051ea 100644
--- a/testing/tests/regression-suite/011-Mulberry-PUT-1b.test
+++ b/testing/tests/regression-suite/011-Mulberry-PUT-1b.test
@@ -43,12 +43,12 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart, dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now",
        caldav_data AS "A1 CalDAV DATA"
-FROM caldav_data JOIN calendar_item USING(dav_name)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
 WHERE caldav_data.dav_name ~ '^/user1/home/'
 ENDQUERY
 
diff --git a/testing/tests/regression-suite/233-Moz-PUT.result b/testing/tests/regression-suite/233-Moz-PUT.result
index 44c57057..9a17d8ff 100644
--- a/testing/tests/regression-suite/233-Moz-PUT.result
+++ b/testing/tests/regression-suite/233-Moz-PUT.result
@@ -53,9 +53,9 @@ END:VCALENDAR
             class: >PUBLIC<
          dav_etag: >e8060931f30c1798ac58ffbe4ec0bffc<
       description: >Twice-weekly breakfast meeting<
-            dtend: >2007-12-11 08:30:00+13<
+            dtend: >2007-12-11 08:30:00<
           dtstamp: >2007-12-03 20:26:30<
-          dtstart: >2007-12-11 07:45:00+13<
+          dtstart: >2007-12-11 07:45:00<
               due: >NULL<
          location: >Suzies Coffee Lounge<
       logged_user: >10<
diff --git a/testing/tests/regression-suite/233-Moz-PUT.test b/testing/tests/regression-suite/233-Moz-PUT.test
index 6db8ba6c..813802a4 100644
--- a/testing/tests/regression-suite/233-Moz-PUT.test
+++ b/testing/tests/regression-suite/233-Moz-PUT.test
@@ -59,12 +59,12 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart, dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS " CalDAV Data",
       ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
-FROM caldav_data JOIN calendar_item USING(dav_name)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
 WHERE caldav_data.dav_name =
 '/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics';
 ENDQUERY
diff --git a/testing/tests/regression-suite/234-Moz-PUT.result b/testing/tests/regression-suite/234-Moz-PUT.result
index dc27d488..57c75ff8 100644
--- a/testing/tests/regression-suite/234-Moz-PUT.result
+++ b/testing/tests/regression-suite/234-Moz-PUT.result
@@ -51,8 +51,8 @@ END:VCALENDAR
       description: >NULL<
             dtend: >NULL<
           dtstamp: >2007-12-03 20:29:15<
-          dtstart: >2007-12-09 13:30:00+13<
-              due: >2007-12-09 13:30:00+13<
+          dtstart: >2007-12-09 13:30:00<
+              due: >2007-12-09 13:30:00<
          location: >NULL<
       logged_user: >10<
  percent_complete: >95.00<
diff --git a/testing/tests/regression-suite/234-Moz-PUT.test b/testing/tests/regression-suite/234-Moz-PUT.test
index be18b048..185b498d 100644
--- a/testing/tests/regression-suite/234-Moz-PUT.test
+++ b/testing/tests/regression-suite/234-Moz-PUT.test
@@ -57,12 +57,12 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart, dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due at time zone tz_locn as due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS " CalDAV Data",
       ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
-FROM caldav_data JOIN calendar_item USING(dav_name)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
 WHERE caldav_data.dav_name =
 '/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics';
 ENDQUERY
diff --git a/testing/tests/regression-suite/505-iCal-PUT.result b/testing/tests/regression-suite/505-iCal-PUT.result
index c5faec55..2ffd1f7c 100644
--- a/testing/tests/regression-suite/505-iCal-PUT.result
+++ b/testing/tests/regression-suite/505-iCal-PUT.result
@@ -54,9 +54,9 @@ END:VCALENDAR
       caldav_type: >VEVENT<
             class: >PUBLIC<
       description: >NULL<
-            dtend: >2007-11-26 00:00:00+13<
+            dtend: >2007-11-26 00:00:00<
           dtstamp: >2007-11-23 09:30:48<
-          dtstart: >2007-11-25 23:00:00+13<
+          dtstart: >2007-11-25 23:00:00<
               due: >NULL<
          location: >NULL<
       logged_user: >10<
diff --git a/testing/tests/regression-suite/505-iCal-PUT.test b/testing/tests/regression-suite/505-iCal-PUT.test
index 72d6b36a..54358d23 100644
--- a/testing/tests/regression-suite/505-iCal-PUT.test
+++ b/testing/tests/regression-suite/505-iCal-PUT.test
@@ -59,12 +59,12 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart, dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS " CalDAV Data",
       ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
-FROM caldav_data JOIN calendar_item USING(dav_name)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
 WHERE caldav_data.dav_etag =
 'b3e66a461ef178bd4791b2b6509bbb9d';
 ENDQUERY
diff --git a/testing/tests/regression-suite/506-iCal-PUT.result b/testing/tests/regression-suite/506-iCal-PUT.result
index 1e8b3015..8314ec7b 100644
--- a/testing/tests/regression-suite/506-iCal-PUT.result
+++ b/testing/tests/regression-suite/506-iCal-PUT.result
@@ -55,9 +55,9 @@ END:VCALENDAR
       caldav_type: >VEVENT<
             class: >PUBLIC<
       description: >NULL<
-            dtend: >2007-11-25 19:00:00+13<
+            dtend: >2007-11-25 19:00:00<
           dtstamp: >2007-11-23 09:32:23<
-          dtstart: >2007-11-25 13:00:00+13<
+          dtstart: >2007-11-25 13:00:00<
               due: >NULL<
          location: >ML's House<
       logged_user: >10<
diff --git a/testing/tests/regression-suite/506-iCal-PUT.test b/testing/tests/regression-suite/506-iCal-PUT.test
index 29c36211..a4843304 100644
--- a/testing/tests/regression-suite/506-iCal-PUT.test
+++ b/testing/tests/regression-suite/506-iCal-PUT.test
@@ -61,12 +61,12 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart, dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS " CalDAV Data",
       ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
-FROM caldav_data JOIN calendar_item USING(dav_name)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
 WHERE caldav_data.dav_etag =
 '5f050eca5480bbebbe9428222570913d';
 ENDQUERY
diff --git a/testing/tests/regression-suite/512-iCal-PUT.result b/testing/tests/regression-suite/512-iCal-PUT.result
index 7fa95125..a343cc13 100644
--- a/testing/tests/regression-suite/512-iCal-PUT.result
+++ b/testing/tests/regression-suite/512-iCal-PUT.result
@@ -55,9 +55,9 @@ END:VCALENDAR
             class: >PUBLIC<
          dav_etag: >b7cfb403232dc83f936c15a179901d50<
       description: >NULL<
-            dtend: >2007-11-26 23:00:00+13<
+            dtend: >2007-11-26 23:00:00<
           dtstamp: >2007-11-24 08:37:09<
-          dtstart: >2007-11-26 22:00:00+13<
+          dtstart: >2007-11-26 22:00:00<
               due: >NULL<
          location: >NULL<
       logged_user: >10<
diff --git a/testing/tests/regression-suite/512-iCal-PUT.test b/testing/tests/regression-suite/512-iCal-PUT.test
index de199c3d..bb55d290 100644
--- a/testing/tests/regression-suite/512-iCal-PUT.test
+++ b/testing/tests/regression-suite/512-iCal-PUT.test
@@ -59,12 +59,12 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart, dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS " CalDAV Data",
       ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
-FROM caldav_data JOIN calendar_item USING(dav_name)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
 WHERE caldav_data.dav_name =
 '/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA.ics';
 ENDQUERY
diff --git a/testing/tests/regression-suite/513-iCal-PUT.result b/testing/tests/regression-suite/513-iCal-PUT.result
index ce2c00a0..c09b9962 100644
--- a/testing/tests/regression-suite/513-iCal-PUT.result
+++ b/testing/tests/regression-suite/513-iCal-PUT.result
@@ -56,9 +56,9 @@ END:VCALENDAR
             class: >PUBLIC<
          dav_etag: >087d1ea4915719b8a904ca18a9abbbe1<
       description: >NULL<
-            dtend: >2007-11-26 17:00:00+13<
+            dtend: >2007-11-26 17:00:00<
           dtstamp: >2007-11-24 08:38:10<
-          dtstart: >2007-11-26 07:00:00+13<
+          dtstart: >2007-11-26 07:00:00<
               due: >NULL<
          location: >NULL<
       logged_user: >10<
diff --git a/testing/tests/regression-suite/513-iCal-PUT.test b/testing/tests/regression-suite/513-iCal-PUT.test
index b40560c8..a218d9ff 100644
--- a/testing/tests/regression-suite/513-iCal-PUT.test
+++ b/testing/tests/regression-suite/513-iCal-PUT.test
@@ -64,12 +64,12 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart, dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS " CalDAV Data",
       ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
-FROM caldav_data JOIN calendar_item USING(dav_name)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
 WHERE caldav_data.dav_etag =
 '087d1ea4915719b8a904ca18a9abbbe1';
 ENDQUERY
diff --git a/testing/tests/regression-suite/514-iCal-PUT-VTODO.result b/testing/tests/regression-suite/514-iCal-PUT-VTODO.result
index 164c368d..8c2e22ca 100644
--- a/testing/tests/regression-suite/514-iCal-PUT-VTODO.result
+++ b/testing/tests/regression-suite/514-iCal-PUT-VTODO.result
@@ -46,8 +46,8 @@ END:VCALENDAR
       description: >Organise a party<
             dtend: >NULL<
           dtstamp: >2007-11-24 22:09:25<
-          dtstart: >2004-01-01 12:00:00+13<
-              due: >2010-02-17 00:00:00+13<
+          dtstart: >2004-01-01 12:00:00<
+              due: >2010-02-17 00:00:00<
          location: >NULL<
       logged_user: >10<
  percent_complete: >NULL<
diff --git a/testing/tests/regression-suite/514-iCal-PUT-VTODO.test b/testing/tests/regression-suite/514-iCal-PUT-VTODO.test
index 1067a9ac..bd6bc563 100644
--- a/testing/tests/regression-suite/514-iCal-PUT-VTODO.test
+++ b/testing/tests/regression-suite/514-iCal-PUT-VTODO.test
@@ -48,12 +48,12 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart, dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due at time zone tz_locn as due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS " CalDAV Data",
       ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
-FROM caldav_data JOIN calendar_item USING(dav_name)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
 WHERE caldav_data.dav_name =
 '/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74.ics';
 ENDQUERY
diff --git a/testing/tests/regression-suite/515-iCal-PUT-VEVENT.result b/testing/tests/regression-suite/515-iCal-PUT-VEVENT.result
index f53354cc..85819dde 100644
--- a/testing/tests/regression-suite/515-iCal-PUT-VEVENT.result
+++ b/testing/tests/regression-suite/515-iCal-PUT-VEVENT.result
@@ -67,9 +67,9 @@ END:VCALENDAR
             class: >PUBLIC<
          dav_etag: >c057c3eb789b944e76f4d77fccf36ea1<
       description: >Lunch will be needed<
-            dtend: >2007-11-23 14:00:00+13<
+            dtend: >2007-11-23 14:00:00<
           dtstamp: >2007-11-24 22:19:00<
-          dtstart: >2007-11-23 12:00:00+13<
+          dtstart: >2007-11-23 12:00:00<
               due: >NULL<
          location: >NULL<
       logged_user: >10<
diff --git a/testing/tests/regression-suite/804-Mulberry-PUT-1.test b/testing/tests/regression-suite/804-Mulberry-PUT-1.test
index f51ce85b..a47b6307 100644
--- a/testing/tests/regression-suite/804-Mulberry-PUT-1.test
+++ b/testing/tests/regression-suite/804-Mulberry-PUT-1.test
@@ -58,12 +58,12 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
-       uid, dtstamp, dtstart, dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now",
        caldav_data AS "A1 CalDAV DATA"
-FROM caldav_data JOIN calendar_item USING(dav_name)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
 WHERE caldav_data.dav_name ~ '^/user1/home/i1278618276.ics'
 ENDQUERY
 
diff --git a/testing/tests/regression-suite/817-Spec-PUT.result b/testing/tests/regression-suite/817-Spec-PUT.result
index 646c1261..273b4007 100644
--- a/testing/tests/regression-suite/817-Spec-PUT.result
+++ b/testing/tests/regression-suite/817-Spec-PUT.result
@@ -41,9 +41,9 @@ END:VCALENDAR
             class: >PUBLIC<
          dav_etag: >165746adbab8bc0c8336a63cc5332ff2<
       description: >Have a party. All the best parties are monthly!<
-            dtend: >2008-11-15 00:00:00+13<
+            dtend: >2008-11-15 00:00:00<
           dtstamp: >2008-10-24 22:09:25<
-          dtstart: >2008-11-14 00:00:00+13<
+          dtstart: >2008-11-14 00:00:00<
               due: >NULL<
          location: >NULL<
       logged_user: >10<
diff --git a/testing/tests/regression-suite/817-Spec-PUT.test b/testing/tests/regression-suite/817-Spec-PUT.test
index a4f79b77..1139fa8f 100644
--- a/testing/tests/regression-suite/817-Spec-PUT.test
+++ b/testing/tests/regression-suite/817-Spec-PUT.test
@@ -45,13 +45,13 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart, dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS " CalDAV Data",
       ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now",
       dtend - dtstart AS "~Duration"
-FROM caldav_data JOIN calendar_item USING(dav_name)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
 WHERE caldav_data.dav_name =
 '/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics';
 ENDQUERY
diff --git a/testing/tests/regression-suite/818-Spec-PUT.result b/testing/tests/regression-suite/818-Spec-PUT.result
index e74fe007..a424b454 100644
--- a/testing/tests/regression-suite/818-Spec-PUT.result
+++ b/testing/tests/regression-suite/818-Spec-PUT.result
@@ -41,9 +41,9 @@ END:VCALENDAR
             class: >PUBLIC<
          dav_etag: >8600dc4a1b264a09a5f741d710497cba<
       description: >Have a microparty. All the best parties are monthly!<
-            dtend: >2008-11-21 16:00:00+13<
+            dtend: >2008-11-21 16:00:00<
           dtstamp: >2008-10-24 22:09:25<
-          dtstart: >2008-11-21 16:00:00+13<
+          dtstart: >2008-11-21 16:00:00<
               due: >NULL<
          location: >NULL<
       logged_user: >10<
diff --git a/testing/tests/regression-suite/818-Spec-PUT.test b/testing/tests/regression-suite/818-Spec-PUT.test
index b93e4d77..b4d7fb8e 100644
--- a/testing/tests/regression-suite/818-Spec-PUT.test
+++ b/testing/tests/regression-suite/818-Spec-PUT.test
@@ -45,13 +45,13 @@ ENDDATA
 
 QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
-       uid, dtstamp, dtstart, dtend, due, summary, location,
+       uid, dtstamp, dtstart at time zone tz_locn as dtstart, dtend at time zone tz_locn as dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
        percent_complete, tz_id, status,
        caldav_data AS " CalDAV Data",
       ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now",
       dtend - dtstart AS "~Duration"
-FROM caldav_data JOIN calendar_item USING(dav_name)
+FROM caldav_data JOIN calendar_item USING(dav_name) JOIN time_zone USING (tz_id)
 WHERE caldav_data.dav_name =
 '/user1/home/MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics';
 ENDQUERY
diff --git a/testing/tests/regression-suite/Create-Database.result b/testing/tests/regression-suite/Create-Database.result
index 14e05a25..a0a212a5 100644
--- a/testing/tests/regression-suite/Create-Database.result
+++ b/testing/tests/regression-suite/Create-Database.result
@@ -1,3 +1,4 @@
+CREATE DATABASE
 Supported locales updated.
 CalDAV functions updated.
 RRULE functions updated.