From 121f02069f7cf40183ebb6a8393338e0deb2a4f0 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Mon, 10 Sep 2012 13:14:53 +1200
Subject: [PATCH] Fix UID handling.

---
 inc/WritableCollection.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/inc/WritableCollection.php b/inc/WritableCollection.php
index 4c5f6efa..f3589527 100644
--- a/inc/WritableCollection.php
+++ b/inc/WritableCollection.php
@@ -451,7 +451,8 @@ EOSQL;
     $params = array( ':collection_id' => $this->collection_id() );
     if ( $some_old_token == 0 || empty($some_old_token) ) {
       $sql = <<<EOSQL
-  SELECT calendar_item.*, caldav_data.*, addressbook_resource.*, 201 AS sync_status
+  SELECT calendar_item.*, caldav_data.*, addressbook_resource.*, 201 AS sync_status,
+         COALESCE(addressbook_resource.uid,calendar_item.uid) AS uid
       FROM caldav_data
       LEFT JOIN calendar_item USING (dav_id)
       LEFT JOIN addressbook_resource USING (dav_id)
@@ -462,7 +463,8 @@ EOSQL;
     else {
       $params[':sync_token'] = $some_old_token;
       $sql = <<<EOSQL
-  SELECT calendar_item.*, caldav_data.*, addressbook_resource.*, sync_changes.*
+  SELECT calendar_item.*, caldav_data.*, addressbook_resource.*, sync_changes.*,
+         COALESCE(addressbook_resource.uid,calendar_item.uid) AS uid
       FROM sync_changes
       LEFT JOIN caldav_data USING (collection_id,dav_id)
       LEFT JOIN calendar_item USING (collection_id,dav_id)
@@ -476,7 +478,7 @@ EOSQL;
     $qry = new AwlQuery($sql, $params );
 
     $changes = array();
-    if ( $qry->Exec() && $qry->rows() ) {
+    if ( $qry->Exec('WritableCollection') && $qry->rows() ) {
       while( $change = $qry->Fetch() ) {
         $changes[$change->uid] = $change;
       }