Blame 0003-Fix-retrieving-of-GID-from-SQL-query-result-in-Fetch.patch
|
Rex Dieter |
78fb1bf |
From 1d47dd274dd29bec42170d0cdf69cb9ac0b6686e Mon Sep 17 00:00:00 2001
|
|
Rex Dieter |
78fb1bf |
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
|
|
Rex Dieter |
78fb1bf |
Date: Thu, 24 Apr 2014 15:37:32 +0200
|
|
Rex Dieter |
78fb1bf |
Subject: [PATCH 3/7] Fix retrieving of GID from SQL query result in
|
|
Rex Dieter |
78fb1bf |
FetchHelper
|
|
Rex Dieter |
78fb1bf |
|
|
Rex Dieter |
78fb1bf |
This has been broken since the day one, but nobody noticed. I guess
|
|
Rex Dieter |
78fb1bf |
we were lucky enough to always query other arguments, so that
|
|
Rex Dieter |
78fb1bf |
ItemQueryPimItemGidColumn actually matched indexed of the GID column
|
|
Rex Dieter |
78fb1bf |
in query.
|
|
Rex Dieter |
78fb1bf |
|
|
Rex Dieter |
78fb1bf |
Another reason why we need proper unit-tests on the server...
|
|
Rex Dieter |
78fb1bf |
---
|
|
Rex Dieter |
78fb1bf |
server/src/handler/fetchhelper.cpp | 2 +-
|
|
Rex Dieter |
78fb1bf |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Rex Dieter |
78fb1bf |
|
|
Rex Dieter |
78fb1bf |
diff --git a/server/src/handler/fetchhelper.cpp b/server/src/handler/fetchhelper.cpp
|
|
Rex Dieter |
78fb1bf |
index a6888a3..4d9f778 100644
|
|
Rex Dieter |
78fb1bf |
--- a/server/src/handler/fetchhelper.cpp
|
|
Rex Dieter |
78fb1bf |
+++ b/server/src/handler/fetchhelper.cpp
|
|
Rex Dieter |
78fb1bf |
@@ -367,7 +367,7 @@ bool FetchHelper::fetchItems( const QByteArray &responseIdentifier )
|
|
Rex Dieter |
78fb1bf |
}
|
|
Rex Dieter |
78fb1bf |
}
|
|
Rex Dieter |
78fb1bf |
if ( mFetchScope.gidRequested() ) {
|
|
Rex Dieter |
78fb1bf |
- const QByteArray gid = Utils::variantToByteArray( itemQuery.value( ItemQueryPimItemGidColumn ) );
|
|
Rex Dieter |
78fb1bf |
+ const QByteArray gid = Utils::variantToByteArray( extractQueryResult( itemQuery, ItemQueryPimItemGidColumn ) );
|
|
Rex Dieter |
78fb1bf |
if ( !gid.isEmpty() ) {
|
|
Rex Dieter |
78fb1bf |
attributes.append( AKONADI_PARAM_GID " " + ImapParser::quote( gid ) );
|
|
Rex Dieter |
78fb1bf |
}
|
|
Rex Dieter |
78fb1bf |
--
|
|
Rex Dieter |
78fb1bf |
1.9.3
|
|
Rex Dieter |
78fb1bf |
|