From: Minje Ahn <minje.ahn@samsung.com>
Date: Wed, 3 Apr 2019 02:26:39 +0000 (+0900)
Subject: Match columns of tag with filter keyword
X-Git-Tag: accepted/tizen/unified/20190404.022025~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4a2a0e9c1a3e167f62edc4743ed25b1f6765a2c;p=platform%2Fcore%2Fmultimedia%2Flibmedia-service.git

Match columns of tag with filter keyword

Change-Id: If5f2cc7a734f95789a992043b83e3aac4c9432e5
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
---

diff --git a/src/common/media-svc-db-utils.c b/src/common/media-svc-db-utils.c
index eb96496..ef3182d 100755
--- a/src/common/media-svc-db-utils.c
+++ b/src/common/media-svc-db-utils.c
@@ -203,7 +203,7 @@ static int __media_svc_rebuild_view_query(sqlite3 *db_handle, uid_t uid)
 		col_ptr = g_slist_nth_data(column_list[MEDIA_SVC_DB_LIST_TAG_MAP], i);
 		if (col_ptr->is_view) {
 			if (strncmp(col_ptr->name, MEDIA_SVC_DB_COLUMN_MAP_ID, strlen(MEDIA_SVC_DB_COLUMN_MAP_ID)) == 0)
-				snprintf(temp, sizeof(temp), ", media_count IS NOT NULL AS media_count, tag_map.%s AS tm_id", col_ptr->name);
+				snprintf(temp, sizeof(temp), ", tag_media_count IS NOT NULL AS tag_media_count, tag_map.%s AS tm_id", col_ptr->name);
 			else
 				snprintf(temp, sizeof(temp), ", tag_map.%s", col_ptr->name);
 			SAFE_STRLCAT(table_query, temp, sizeof(table_query));
@@ -416,7 +416,7 @@ int _media_svc_make_table_query(const char *table_name, media_svc_table_slist_e
 				col_ptr = g_slist_nth_data(column_list[MEDIA_SVC_DB_LIST_TAG_MAP], i);
 				if (col_ptr->is_view) {
 					if (strncmp(col_ptr->name, MEDIA_SVC_DB_COLUMN_MAP_ID, strlen(MEDIA_SVC_DB_COLUMN_MAP_ID)) == 0)
-						snprintf(temp, sizeof(temp), ", media_count IS NOT NULL AS media_count, tag_map.%s AS tm_id", col_ptr->name);
+						snprintf(temp, sizeof(temp), ", tag_media_count IS NOT NULL AS tag_media_count, tag_map.%s AS tm_id", col_ptr->name);
 					else
 						snprintf(temp, sizeof(temp), ", tag_map.%s", col_ptr->name);
 					SAFE_STRLCAT(table_query, temp, sizeof(table_query));
@@ -705,7 +705,7 @@ int _media_svc_init_table_query(const char *event_table_name)
 	/*tag*/
 	ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_TAG], "tag_id ", MEDIA_SVC_DB_TYPE_INT, "PRIMARY KEY AUTOINCREMENT", USER_V2, NULL, false, true, true);
 	media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-	ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_TAG], "name", MEDIA_SVC_DB_TYPE_TEXT, "NOT NULL UNIQUE", USER_V2, NULL, false, false, true);
+	ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_TAG], "tag_name", MEDIA_SVC_DB_TYPE_TEXT, "NOT NULL UNIQUE", USER_V2, NULL, false, false, true);
 	media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
 	/*bookmark*/
diff --git a/src/include/common/media-svc-env.h b/src/include/common/media-svc-env.h
index 3e52b33..a0534ef 100755
--- a/src/include/common/media-svc-env.h
+++ b/src/include/common/media-svc-env.h
@@ -119,7 +119,7 @@ extern "C" {
 #define MEDIA_SVC_DB_QUERY_VIEW_TAG			"CREATE VIEW IF NOT EXISTS %s AS SELECT %s FROM tag \
 			LEFT OUTER JOIN tag_map ON tag.tag_id=tag_map.tag_id \
 			LEFT OUTER JOIN media_view ON (tag_map.media_uuid = media_view.media_uuid AND media_view.validity=1) \
-			LEFT OUTER JOIN (SELECT count(tag_id) as media_count, tag_id FROM tag_map group by tag_id) as cnt_tbl ON (cnt_tbl.tag_id=tag_map.tag_id AND media_view.validity=1);"
+			LEFT OUTER JOIN (SELECT count(tag_id) as tag_media_count, tag_id FROM tag_map group by tag_id) as cnt_tbl ON (cnt_tbl.tag_id=tag_map.tag_id AND media_view.validity=1);"
 #define MEDIA_SVC_DB_QUERY_ALTER_TABLE		"ALTER TABLE %s ADD COLUMN %s;"
 #define MEDIA_SVC_DB_QUERY_DROP_VIEW			"DROP VIEW IF EXISTS %s;"