diff options
| author | Kyeonghun Lee <kh9090.lee@samsung.com> | 2017-01-04 17:09:45 +0900 |
|---|---|---|
| committer | Kyeonghun Lee <kh9090.lee@samsung.com> | 2017-01-04 17:09:45 +0900 |
| commit | 30556dafdb8c65e5e6cad243ac80494accee7e79 (patch) | |
| tree | 04858a5474f9eb86b32f04a6ddbac827c8b44dbf | |
| parent | dd8db2370811e9f749881a88465a8810b5cf15e5 (diff) | |
| download | msg-service-30556dafdb8c65e5e6cad243ac80494accee7e79.tar.gz msg-service-30556dafdb8c65e5e6cad243ac80494accee7e79.tar.bz2 msg-service-30556dafdb8c65e5e6cad243ac80494accee7e79.zip | |
fix query to get threads info which have any protected messagessubmit/tizen_3.0/20170104.081813
Change-Id: I74226a9f9cbfe8acc2f3968e3a30688baf1d1c70
Signed-off-by: Kyeonghun Lee <kh9090.lee@samsung.com>
| -rwxr-xr-x | framework/storage-handler/MsgStorageMessage.cpp | 3 | ||||
| -rwxr-xr-x | utils/MsgUtilStorage.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
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, |