diff options
author | Kyeonghun Lee <kh9090.lee@samsung.com> | 2017-01-26 13:41:46 +0900 |
---|---|---|
committer | Kyeonghun Lee <kh9090.lee@samsung.com> | 2017-01-31 09:49:35 +0900 |
commit | 0f11fdb99bb091729dbbe088a466f53c530c1484 (patch) | |
tree | 1a1b2a62c2f140dea92ebfa8f98ca856e573ec1e /utils/MsgUtilStorage.cpp | |
parent | ca166a187105bd06ad25df8e12dda608f5f69a7d (diff) | |
download | msg-service-0f11fdb99bb091729dbbe088a466f53c530c1484.tar.gz msg-service-0f11fdb99bb091729dbbe088a466f53c530c1484.tar.bz2 msg-service-0f11fdb99bb091729dbbe088a466f53c530c1484.zip |
Enhance db querying for getting thread list and thread infosubmit/tizen/20170131.012439accepted/tizen/wearable/20170201.003819accepted/tizen/mobile/20170201.003805accepted/tizen/ivi/20170201.003836accepted/tizen/common/20170131.162928
- from slp git
Change-Id: I8acbd892e789046e46c0b8a3c622900973f6b671
Signed-off-by: Kyeonghun Lee <kh9090.lee@samsung.com>
Diffstat (limited to 'utils/MsgUtilStorage.cpp')
-rwxr-xr-x | utils/MsgUtilStorage.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/utils/MsgUtilStorage.cpp b/utils/MsgUtilStorage.cpp index f5c2e49..f2645fd 100755 --- a/utils/MsgUtilStorage.cpp +++ b/utils/MsgUtilStorage.cpp @@ -1711,20 +1711,20 @@ msg_error_t MsgStoGetThreadViewList(const MSG_SORT_RULE_S *pSortRule, msg_struct snprintf(sqlQuery, sizeof(sqlQuery), "SELECT A.CONV_ID, A.UNREAD_CNT, A.SMS_CNT, A.MMS_CNT, A.MAIN_TYPE, A.SUB_TYPE, " "A.MSG_DIRECTION, A.DISPLAY_TIME, A.DISPLAY_NAME, A.MSG_TEXT, " - "(SELECT COUNT(MSG_ID) FROM %s M WHERE M.CONV_ID = A.CONV_ID AND M.PROTECTED = 1) AS PROTECTED, " + "(COUNT(CASE WHEN M.PROTECTED = 1 THEN 1 END)) AS PROTECTED, " "(CASE WHEN B.FOLDER_ID = %d THEN 1 END) AS DRAFT, " "(CASE WHEN B.NETWORK_STATUS = %d THEN 1 END) AS FAILED, " "(CASE WHEN B.NETWORK_STATUS = %d THEN 1 END) AS SENDING " "FROM %s A " - "LEFT OUTER JOIN " - "%s B ON A.LAST_MSG_ID = B.MSG_ID " + "LEFT OUTER JOIN %s B ON A.LAST_MSG_ID = B.MSG_ID " + "LEFT OUTER JOIN %s M ON A.CONV_ID = M.CONV_ID " "WHERE A.SMS_CNT + A.MMS_CNT > 0 " "GROUP BY A.CONV_ID ORDER BY A.DISPLAY_TIME DESC;", - MSGFW_MESSAGE_TABLE_NAME, MSG_DRAFT_ID, MSG_NETWORK_SEND_FAIL, MSG_NETWORK_SENDING, MSGFW_CONVERSATION_TABLE_NAME, + MSGFW_MESSAGE_TABLE_NAME, MSGFW_MESSAGE_TABLE_NAME); msg_error_t err = dbHandle->getTable(sqlQuery, &rowCnt, &index); @@ -1781,7 +1781,7 @@ msg_error_t MsgStoGetThreadViewList(const MSG_SORT_RULE_S *pSortRule, msg_struct memset(pTmp->threadData, 0x00, sizeof(pTmp->threadData)); dbHandle->getColumnToString(index++, MAX_THREAD_DATA_LEN, pTmp->threadData); - pTmp->bProtected = dbHandle->getColumnToInt(index++); + pTmp->bProtected = (dbHandle->getColumnToInt(index++) > 0) ? true : false; pTmp->bDraft = dbHandle->getColumnToInt(index++); pTmp->bSendFailed = dbHandle->getColumnToInt(index++); pTmp->bSending = dbHandle->getColumnToInt(index++); |