From 02f872c72538f18cc9d5385ec1ad179142c4bfae Mon Sep 17 00:00:00 2001 From: Jeesun Kim Date: Fri, 23 Dec 2016 17:03:15 +0900 Subject: [PATCH] nickname is not searched when name is searched Change-Id: I9fea08ae43ea201fb315da93ab726b182b323dd6 --- server/db/ctsvc_db_plugin_contact.c | 2 +- server/db/ctsvc_db_query.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/db/ctsvc_db_plugin_contact.c b/server/db/ctsvc_db_plugin_contact.c index 85e63f7..0f5befe 100644 --- a/server/db/ctsvc_db_plugin_contact.c +++ b/server/db/ctsvc_db_plugin_contact.c @@ -1071,7 +1071,7 @@ static inline int __ctsvc_contact_refresh_lookup_data(int contact_id, ctsvc_cont ctsvc_normalize_str(nickname->nickname, &normalized_nickname); snprintf(query, sizeof(query), "INSERT INTO %s(data_id, contact_id, name, type) " "VALUES(%d, %d, ?, %d)", CTS_TABLE_NAME_LOOKUP, nickname->id, - contact_id, 0); + contact_id, CONTACTS_DATA_TYPE_NICKNAME); ret = ctsvc_query_prepare(query, &stmt); if (NULL == stmt) { diff --git a/server/db/ctsvc_db_query.c b/server/db/ctsvc_db_query.c index 6f1bc84..1e57e29 100644 --- a/server/db/ctsvc_db_query.c +++ b/server/db/ctsvc_db_query.c @@ -468,7 +468,7 @@ static char *_get_search_query_for_name(const char *keyword) korean_pattern = calloc(len_keyword *5, sizeof(char)); ctsvc_get_korean_search_pattern(half_keyword, korean_pattern, len_keyword * 5); temp_len = SAFE_SNPRINTF(&query, &query_size, len, " INTERSECT SELECT " - "contact_id FROM "CTS_TABLE_NAME_LOOKUP" WHERE name GLOB '*"); + "contact_id FROM "CTS_TABLE_NAME_LOOKUP" WHERE type = 0 AND name GLOB '*"); if (0 <= temp_len) len += temp_len; @@ -503,7 +503,7 @@ static char *_get_search_query_for_name(const char *keyword) } temp_str[j] = '\0'; temp_len = SAFE_SNPRINTF(&query, &query_size, len, " UNION SELECT contact_id " - " FROM "CTS_TABLE_NAME_LOOKUP" WHERE name LIKE '%%"); + " FROM "CTS_TABLE_NAME_LOOKUP" WHERE type = 0 AND name LIKE '%%"); if (0 <= temp_len) len += temp_len; -- 2.7.4