[Pkg-owncloud-commits] [owncloud-client] 18/211: SyncJournal: Use the NOCASE Collate for blacklist query.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 04558beabeeb0fe5a00de64e93c56c1cff6fbac4
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Mon Oct 6 18:37:53 2014 +0200

    SyncJournal: Use the NOCASE Collate for blacklist query.
---
 src/mirall/syncjournaldb.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp
index 2fa119f..752fb05 100644
--- a/src/mirall/syncjournaldb.cpp
+++ b/src/mirall/syncjournaldb.cpp
@@ -272,9 +272,15 @@ bool SyncJournalDb::checkConnect()
     _deleteFileRecordRecursively.reset(new QSqlQuery(_db));
     _deleteFileRecordRecursively->prepare("DELETE FROM metadata WHERE path LIKE(?||'/%')");
 
+    QString sql( "SELECT lastTryEtag, lastTryModtime, retrycount, errorstring "
+                 "FROM blacklist WHERE path=:path");
+    if( Utility::fsCasePreserving() ) {
+        // if the file system is case preserving we have to check the blacklist
+        // case insensitively
+        sql += QLatin1String(" COLLATE NOCASE");
+    }
     _blacklistQuery.reset(new QSqlQuery(_db));
-    _blacklistQuery->prepare("SELECT lastTryEtag, lastTryModtime, retrycount, errorstring "
-                             "FROM blacklist WHERE path=:path");
+    _blacklistQuery->prepare(sql);
 
     return rc;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git