nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-03-13 08:00:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix UID handling.

Browse Source
This commit is contained in:
Andrew McMillan 2012-09-10 13:14:53 +12:00
parent 0a435d4f22
commit 121f02069f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inc/WritableCollection.php
View File

@ -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;
}