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

Make the sync report work with non-calendar resources.

Browse Source
This commit is contained in:
Andrew McMillan 2010-09-23 23:21:11 +12:00
parent b855a3cbc3
commit dd1d3903ff
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
inc/caldav-REPORT-sync-collection.php
View File

@ -56,11 +56,12 @@ EOSQL;
}
else {
$sql = <<<EOSQL
SELECT collection.*, caldav_data.*, calendar_item.*, sync_changes.*
SELECT collection.*, calendar_item.*, caldav_data.*, addressbook_resource.*, 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 = :collection_id
LEFT JOIN calendar_item USING (collection_id,dav_id)
LEFT JOIN addressbook_resource USING (dav_id)
WHERE collection.collection_id = :collection_id
AND sync_time > (SELECT modification_time FROM sync_tokens WHERE sync_token = :sync_token)
ORDER BY collection.collection_id, sync_changes.dav_name, sync_changes.sync_time
EOSQL;