From: Kyeonghun Lee Date: Wed, 4 Jan 2017 08:09:45 +0000 (+0900) Subject: fix query to get threads info which have any protected messages X-Git-Tag: submit/tizen_3.0/20170104.081813^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F10%2F108410%2F1;p=platform%2Fcore%2Fmessaging%2Fmsg-service.git fix query to get threads info which have any protected messages Change-Id: I74226a9f9cbfe8acc2f3968e3a30688baf1d1c70 Signed-off-by: Kyeonghun Lee --- diff --git a/framework/storage-handler/MsgStorageMessage.cpp b/framework/storage-handler/MsgStorageMessage.cpp index 702c581..ca7ea6b 100755 --- a/framework/storage-handler/MsgStorageMessage.cpp +++ b/framework/storage-handler/MsgStorageMessage.cpp @@ -2774,7 +2774,7 @@ msg_error_t MsgStoGetThreadInfo(msg_thread_id_t threadId, MSG_THREAD_VIEW_S *pTh 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, " - "B.PROTECTED, " + "(SELECT COUNT(MSG_ID) FROM %s M WHERE M.CONV_ID = A.CONV_ID AND M.PROTECTED = 1) 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 " @@ -2782,6 +2782,7 @@ msg_error_t MsgStoGetThreadInfo(msg_thread_id_t threadId, MSG_THREAD_VIEW_S *pTh "LEFT OUTER JOIN " "%s B ON A.LAST_MSG_ID = B.MSG_ID " "WHERE A.CONV_ID = %d AND A.SMS_CNT + A.MMS_CNT > 0;", + MSGFW_MESSAGE_TABLE_NAME, MSG_DRAFT_ID, MSG_NETWORK_SEND_FAIL, MSG_NETWORK_SENDING, diff --git a/utils/MsgUtilStorage.cpp b/utils/MsgUtilStorage.cpp index ac9342b..946ef51 100755 --- a/utils/MsgUtilStorage.cpp +++ b/utils/MsgUtilStorage.cpp @@ -1669,7 +1669,7 @@ 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, " - "B.PROTECTED, " + "(SELECT COUNT(MSG_ID) FROM %s M WHERE M.CONV_ID = A.CONV_ID AND M.PROTECTED = 1) 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 " @@ -1678,6 +1678,7 @@ msg_error_t MsgStoGetThreadViewList(const MSG_SORT_RULE_S *pSortRule, msg_struct "%s B ON A.LAST_MSG_ID = B.MSG_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,