Fix select query

Use column name instead of *

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

diff --git a/include/media_info_private.h b/include/media_info_private.h
index 271a1fc..90d9198 100755 (executable)
--- a/include/media_info_private.h
+++ b/include/media_info_private.h
@@ -508,9 +508,9 @@ typedef struct _media_content_cb_data {
 /* Get Group Info by Group ID*/
 #define SELECT_ALBUM_FROM_ALBUM                "SELECT * FROM "DB_TABLE_ALBUM" WHERE album_id=%d"
 #define SELECT_FOLDER_FROM_FOLDER              "SELECT folder_uuid, path, name, storage_type, storage_uuid FROM "DB_TABLE_FOLDER" WHERE folder_uuid='%s'"
-#define SELECT_PLAYLIST_FROM_PLAYLIST  "SELECT * FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d"
-#define SELECT_TAG_FROM_TAG                    "SELECT * FROM "DB_TABLE_TAG" WHERE tag_id=%d"
-#define SELECT_TAG_BY_NAME                             "SELECT * FROM "DB_TABLE_TAG" WHERE name='%q'"
+#define SELECT_PLAYLIST_FROM_PLAYLIST  "SELECT name, thumbnail_path FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d"
+#define SELECT_TAG_FROM_TAG                    "SELECT name FROM "DB_TABLE_TAG" WHERE tag_id=%d"
+#define SELECT_TAG_BY_NAME                             "SELECT tag_id FROM "DB_TABLE_TAG" WHERE name='%q'"
 
 /* Tag info*/
 #define INSERT_TAG_TO_TAG                                              "INSERT INTO "DB_TABLE_TAG" (name) VALUES (%Q)"

diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h
index c243793..0b4c831 100755 (executable)
--- a/include_product/media_info_private.h
+++ b/include_product/media_info_private.h
@@ -676,9 +676,9 @@ typedef struct _media_content_scan_cb_data_v2 {
 /* Get Group Info by Group ID*/
 #define SELECT_ALBUM_FROM_ALBUM                "SELECT * FROM "DB_TABLE_ALBUM" WHERE album_id=%d"
 #define SELECT_FOLDER_FROM_FOLDER              "SELECT folder_uuid, path, name, storage_type, storage_uuid FROM "DB_TABLE_FOLDER" WHERE folder_uuid='%s'"
-#define SELECT_PLAYLIST_FROM_PLAYLIST  "SELECT * FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d"
-#define SELECT_TAG_FROM_TAG                    "SELECT * FROM "DB_TABLE_TAG" WHERE tag_id=%d"
-#define SELECT_TAG_BY_NAME                             "SELECT * FROM "DB_TABLE_TAG" WHERE name='%q'"
+#define SELECT_PLAYLIST_FROM_PLAYLIST  "SELECT name, thumbnail_path FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d"
+#define SELECT_TAG_FROM_TAG                    "SELECT name FROM "DB_TABLE_TAG" WHERE tag_id=%d"
+#define SELECT_TAG_BY_NAME                             "SELECT tag_id FROM "DB_TABLE_TAG" WHERE name='%q'"
 
 /* Tag info*/
 #define INSERT_TAG_TO_TAG                                              "INSERT INTO "DB_TABLE_TAG" (name) VALUES (%Q)"

diff --git a/src/media_playlist.c b/src/media_playlist.c
index 5d0f87a..69b23ab 100755 (executable)
--- a/src/media_playlist.c
+++ b/src/media_playlist.c
@@ -520,9 +520,9 @@ int media_playlist_get_playlist_from_db(int playlist_id, media_playlist_h *playl
                                return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                        }
 
-                       _playlist->playlist_id = (int)sqlite3_column_int(stmt, 0);
-                       _playlist->name = g_strdup((const char *)sqlite3_column_text(stmt, 1));
-                       _playlist->thumbnail_path = g_strdup((const char *)sqlite3_column_text(stmt, 3));
+                       _playlist->playlist_id = playlist_id;
+                       _playlist->name = g_strdup((const char *)sqlite3_column_text(stmt, 0));
+                       _playlist->thumbnail_path = g_strdup((const char *)sqlite3_column_text(stmt, 1));
 
                        *playlist = (media_playlist_h)_playlist;
                } else {

diff --git a/src/media_tag.c b/src/media_tag.c
index de49579..884eccc 100755 (executable)
--- a/src/media_tag.c
+++ b/src/media_tag.c
@@ -103,7 +103,7 @@ static int __media_tag_get_tag_info_from_db(const char *name, media_tag_h tag)
 
        if (sqlite3_step(stmt) == SQLITE_ROW) {
                _tag->tag_id = (int)sqlite3_column_int(stmt, 0);
-               _tag->name = g_strdup((const char *)sqlite3_column_text(stmt, 1));
+               _tag->name = g_strdup(name);
        } else {
                media_content_error("Nonexistent tag name[%s]", name);
                ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
@@ -325,8 +325,8 @@ int media_tag_get_tag_from_db(int tag_id, media_tag_h *tag)
                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                }
 
-               _tag->tag_id = (int)sqlite3_column_int(stmt, 0);
-               _tag->name = g_strdup((const char *)sqlite3_column_text(stmt, 1));
+               _tag->tag_id = tag_id;
+               _tag->name = g_strdup((const char *)sqlite3_column_text(stmt, 0));
 
                *tag = (media_tag_h)_tag;
        } else {