From 606043b5dff029dd7f03b897842f9472df872997 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Mon, 21 Nov 2011 10:54:17 +1300 Subject: [PATCH] Handle strict result ordering for regression tests. --- inc/caldav-REPORT-sync-collection.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/inc/caldav-REPORT-sync-collection.php b/inc/caldav-REPORT-sync-collection.php index 50da1d60..c0e8fa03 100644 --- a/inc/caldav-REPORT-sync-collection.php +++ b/inc/caldav-REPORT-sync-collection.php @@ -82,8 +82,13 @@ EOSQL; 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; + if ( isset($c->strict_result_ordering) && $c->strict_result_ordering ) { + $sql .= " ORDER BY collection.collection_id, lower(sync_changes.dav_name), sync_changes.sync_time"; + } + else { + $sql .= " ORDER BY collection.collection_id, sync_changes.dav_name, sync_changes.sync_time"; + } } $qry = new AwlQuery($sql, $params );