From: Kevin Ottens <kevin.ottens@nextcloud.com>
Date: Tue, 30 Jun 2020 12:19:55 +0000 (+0200)
Subject: Also use mangled paths when looking for entries below a path
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~125^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9a2d04720a5e644041cbbf1ef1badbc88b663bd8;p=nextcloud-desktop.git

Also use mangled paths when looking for entries below a path

Otherwise on second sync we wouldn't find anything under a mangled path
and just end up thinking said files were removed.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
---

diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp
index 43b0b045c..df3360879 100644
--- a/src/common/syncjournaldb.cpp
+++ b/src/common/syncjournaldb.cpp
@@ -1098,6 +1098,7 @@ bool SyncJournalDb::getFilesBelowPath(const QByteArray &path, const std::functio
         if (!_getFilesBelowPathQuery.initOrReset(QByteArrayLiteral(
                 GET_FILE_RECORD_QUERY
                 " WHERE " IS_PREFIX_PATH_OF("?1", "path")
+                " OR " IS_PREFIX_PATH_OF("?1", "e2eMangledName")
                 // We want to ensure that the contents of a directory are sorted
                 // directly behind the directory itself. Without this ORDER BY
                 // an ordering like foo, foo-2, foo/file would be returned.