From 5fac9850db69e9b9642d10afbd3984a18c2d98a9 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Wed, 3 Feb 2010 09:04:40 -0800
Subject: [PATCH] We should be getting the sync_changes data last.

This is so we get dav_name correct for delete actions, which
will otherwise be null since there is no caldav_data or
calendar_item record for them any longer.
---
 inc/caldav-REPORT-sync-collection.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/caldav-REPORT-sync-collection.php b/inc/caldav-REPORT-sync-collection.php
index f17ce2de..de184599 100644
--- a/inc/caldav-REPORT-sync-collection.php
+++ b/inc/caldav-REPORT-sync-collection.php
@@ -53,7 +53,8 @@ EOSQL;
 }
 else {
   $sql = <<<EOSQL
-SELECT * FROM collection LEFT JOIN sync_changes USING(collection_id)
+SELECT collection.*, caldav_data.*, calendar_item.*, sync_changes.*
+  FROM collection LEFT JOIN sync_changes USING(collection_id)
                          LEFT JOIN calendar_item USING (collection_id,dav_id)
                          LEFT JOIN caldav_data USING (collection_id,dav_id)
      WHERE collection.collection_id = ?