Query related code cleanup

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

diff --git a/include/media_info_private.h b/include/media_info_private.h
index 123226f0457831882c8481d9ddff661e70b256a3..66b5414ec456a6aa2731cf5a8f760749983b9202 100755 (executable)
--- a/include/media_info_private.h
+++ b/include/media_info_private.h
@@ -375,8 +375,8 @@ typedef struct _media_content_cb_data {
 #define DB_FIELD_MEDIA_ALTITUDE                "media_altitude"
 
 /* DB Query Keyword */
-#define QUERY_KEYWORD_AND "AND"
-#define QUERY_KEYWORD_OR "OR"
+#define QUERY_KEYWORD_AND "AND "
+#define QUERY_KEYWORD_OR "OR "
 #define QUERY_KEYWORD_ORDER_BY "ORDER BY "
 #define QUERY_KEYWORD_LIMIT "limit"
 #define QUERY_KEYWORD_DESC "DESC"
@@ -443,7 +443,7 @@ typedef struct _media_content_cb_data {
 #define REMOVE_TAG_ITEM_FROM_TAG_MAP           "DELETE FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d AND media_id='%q';"
 #define UPDATE_TAG_NAME_FROM_TAG                       "UPDATE "DB_TABLE_TAG" SET tag_name='%q' WHERE tag_id=%d;"
 #define SELECT_TAG_COUNT_BY_MEDIA_ID                   "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE media_id = '%s'"
-#define SELECT_TAG_LIST_BY_MEDIA_ID                            "SELECT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE media_id = '%s'"
+#define SELECT_TAG_LIST_BY_MEDIA_ID                            "SELECT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE media_id = '%s' "
 
 /* Get Media list of Group */
 #define MEDIA_INFO_ITEM "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, media_thumbnail_path, media_description, \

diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h
index 9bb62bd27262034d3b48b62599017a90b76bd854..5c08874702b57c75d711168787a8d32bcc07911c 100755 (executable)
--- a/include_product/media_info_private.h
+++ b/include_product/media_info_private.h
@@ -549,8 +549,8 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define DB_FIELD_UHD_PLAYED_COUNT                      "played_count"
 
 /* DB Query Keyword */
-#define QUERY_KEYWORD_AND "AND"
-#define QUERY_KEYWORD_OR "OR"
+#define QUERY_KEYWORD_AND "AND "
+#define QUERY_KEYWORD_OR "OR "
 #define QUERY_KEYWORD_ORDER_BY "ORDER BY "
 #define QUERY_KEYWORD_LIMIT "limit"
 #define QUERY_KEYWORD_DESC "DESC"
@@ -610,7 +610,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define REMOVE_TAG_ITEM_FROM_TAG_MAP           "DELETE FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d AND media_id='%q';"
 #define UPDATE_TAG_NAME_FROM_TAG                       "UPDATE "DB_TABLE_TAG" SET tag_name='%q' WHERE tag_id=%d;"
 #define SELECT_TAG_COUNT_BY_MEDIA_ID                   "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE media_id = '%s'"
-#define SELECT_TAG_LIST_BY_MEDIA_ID                            "SELECT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE media_id = '%s'"
+#define SELECT_TAG_LIST_BY_MEDIA_ID                            "SELECT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE media_id = '%s' "
 
 /* Get Media list of Group */
 #ifdef _USE_SENIOR_MODE

diff --git a/src/media_content.c b/src/media_content.c
index e9e8d88fce41e9b0ba55abe89faa4f4987107541..e1ee35371570eb843d005719de8e4b864216e583 100644 (file)
--- a/src/media_content.c
+++ b/src/media_content.c
@@ -43,13 +43,18 @@ int _content_query_prepare(char *select_query, char *condition_query, char *opti
 
        media_content_retvm_if(!STRING_VALID(select_query), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid select_query");
 
-       if (!STRING_VALID(condition_query))
-               condition_query = (char *)" ";
-
-       if (!STRING_VALID(option_query))
-               option_query = (char *)" ";
+       if (STRING_VALID(condition_query)) {
+               if (STRING_VALID(option_query))
+                       query = sqlite3_mprintf("%s AND %s %s", select_query, condition_query, option_query);
+               else
+                       query = sqlite3_mprintf("%s AND %s", select_query, condition_query);
+       } else {
+               if (STRING_VALID(option_query))
+                       query = sqlite3_mprintf("%s %s", select_query, option_query);
+               else
+                       query = sqlite3_mprintf("%s", select_query);
+       }
 
-       query = sqlite3_mprintf("%s %s %s", select_query, condition_query, option_query);
        ret = _content_get_result(query, stmt);
        SQLITE3_SAFE_FREE(query);
 

diff --git a/src/media_db.c b/src/media_db.c
index b69774d2591c7a4758af499aaf02a494b8a478d0..f4e32ce45b9ee1fbfc2dabaeaf55bcc5e9944645 100755 (executable)
--- a/src/media_db.c
+++ b/src/media_db.c
@@ -19,8 +19,6 @@
 #include <media_info_private.h>
 #include <media_util_private.h>
 
-static int __media_db_make_query(filter_h filter, char *select_query, int select_query_size, char **condition_query, char **option_query);
-
 static char * __media_db_get_group_name(media_group_e group)
 {
        switch (group) {
@@ -181,7 +179,7 @@ static char * __media_db_get_group_name(media_group_e group)
        return NULL;
 }
 
-static int __media_db_make_query(filter_h filter, char *select_query, int select_query_size, char **condition_query, char **option_query)
+static int __media_db_make_query(filter_h filter, char **condition_query, char **option_query)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
        filter_s *_filter = NULL;
@@ -209,11 +207,6 @@ static int __media_db_make_query(filter_h filter, char *select_query, int select
                                return ret;
                        }
                }
-
-               if (STRING_VALID(*condition_query)) {
-                       SAFE_STRLCAT(select_query, QUERY_KEYWORD_SPACE, select_query_size);
-                       SAFE_STRLCAT(select_query, QUERY_KEYWORD_AND, select_query_size);
-               }
        }
 
        return ret;
@@ -232,15 +225,6 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro
        memset(select_query, 0x00, sizeof(select_query));
 
        switch (group_type) {
-       case MEDIA_GROUP_NONE:
-       case MEDIA_GROUP_TAG_BY_MEDIA_ID:
-       case MEDIA_GROUP_BOOKMARK_BY_MEDIA_ID:
-       case MEDIA_GROUP_FACE_BY_MEDIA_ID:
-               {
-                       media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-                       return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-               }
-               break;
        case MEDIA_GROUP_ALBUM:
                if ((_filter != NULL) && STRING_VALID(_filter->storage_id))
                        snprintf(select_query, sizeof(select_query), SELECT_ALBUM_COUNT, _filter->storage_id);
@@ -286,17 +270,12 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro
                else
                        snprintf(select_query, sizeof(select_query), SELECT_FACE_COUNT, DB_VIEW_MEDIA);
                break;
-       case MEDIA_GROUP_PVR:
-       case MEDIA_GROUP_UHD:
        default:
-               {
-                       media_content_error("Invalid group type [%d]", group_type);
-                       return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-               }
-               break;
+               media_content_error("Invalid group type [%d]", group_type);
+               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
@@ -338,12 +317,14 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g
                else
                        snprintf(select_query, sizeof(select_query), SELECT_UHD_GROUP_COUNT, __media_db_get_group_name(group));
        }
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        SAFE_STRLCAT(select_query, QUERY_KEYWORD_SPACE, sizeof(select_query));
-       if (STRING_VALID(condition_query))
+       if (STRING_VALID(condition_query)) {
+               SAFE_STRLCAT(select_query, QUERY_KEYWORD_AND, sizeof(select_query));
                SAFE_STRLCAT(select_query, condition_query, sizeof(select_query));
+       }
        if (STRING_VALID(option_query))
                SAFE_STRLCAT(select_query, option_query, sizeof(select_query));
        SAFE_STRLCAT(select_query, QUERY_KEYWORD_BRACKET, sizeof(select_query));
@@ -390,7 +371,7 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_
                else
                        snprintf(select_query, sizeof(select_query), SELECT_UHD_GROUP_LIST, __media_db_get_group_name(group));
        }
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
@@ -451,7 +432,7 @@ int _media_db_get_media_group_and_count(media_group_e group, filter_h filter, me
                        snprintf(select_query, sizeof(select_query), SELECT_UHD_GROUP_AND_COUNT, group_name);
        }
 
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (STRING_VALID(option_query))
@@ -493,15 +474,6 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro
        memset(select_query, 0x00, sizeof(select_query));
 
        switch (group_type) {
-       case MEDIA_GROUP_NONE:
-       case MEDIA_GROUP_TAG_BY_MEDIA_ID:
-       case MEDIA_GROUP_BOOKMARK_BY_MEDIA_ID:
-       case MEDIA_GROUP_FACE_BY_MEDIA_ID:
-               {
-                       media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-                       return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-               }
-               break;
        case MEDIA_GROUP_ALBUM:
                if ((_filter != NULL) && STRING_VALID(_filter->storage_id))
                        snprintf(select_query, sizeof(select_query), SELECT_ALBUM_COUNT_BY_STORAGE_ID, _filter->storage_id);
@@ -548,14 +520,11 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro
                        snprintf(select_query, sizeof(select_query), SELECT_FACE_COUNT);
                break;
        default:
-               {
-                       media_content_error("Invalid group type [%d]", group_type);
-                       return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-               }
-               break;
+               media_content_error("Invalid group type [%d]", group_type);
+               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
@@ -586,12 +555,14 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g
        else
                snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_COUNT, __media_db_get_group_name(group));
 
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        SAFE_STRLCAT(select_query, QUERY_KEYWORD_SPACE, sizeof(select_query));
-       if (STRING_VALID(condition_query))
+       if (STRING_VALID(condition_query)) {
+               SAFE_STRLCAT(select_query, QUERY_KEYWORD_AND, sizeof(select_query));
                SAFE_STRLCAT(select_query, condition_query, sizeof(select_query));
+       }
        if (STRING_VALID(option_query))
                SAFE_STRLCAT(select_query, option_query, sizeof(select_query));
        SAFE_STRLCAT(select_query, QUERY_KEYWORD_BRACKET, sizeof(select_query));
@@ -600,8 +571,6 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g
        SAFE_FREE(option_query);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
-       SAFE_FREE(condition_query);
-       SAFE_FREE(option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (sqlite3_step(stmt) == SQLITE_ROW)
@@ -628,7 +597,7 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_
        else
                snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_LIST, __media_db_get_group_name(group));
 
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
@@ -674,7 +643,7 @@ int _media_db_get_album(filter_h filter, media_album_cb callback, void *user_dat
        else
                snprintf(select_query, sizeof(select_query), SELECT_ALBUM_LIST);
 #endif
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
@@ -730,7 +699,7 @@ int _media_db_get_folder(filter_h filter, media_folder_cb callback, void *user_d
        else
                snprintf(select_query, sizeof(select_query), SELECT_FOLDER_LIST);
 #endif
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
@@ -781,7 +750,7 @@ int _media_db_get_playlist(filter_h filter, media_playlist_cb callback, void *us
                return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
@@ -826,7 +795,7 @@ int _media_db_get_playlist_item(int playlist_id, filter_h filter, playlist_membe
 
        snprintf(select_query, sizeof(select_query), SELECT_PLAYLIST_ITEM_ALL_FROM_PLAYLIST_VIEW, playlist_id);
 
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
@@ -879,11 +848,9 @@ int _media_db_get_tag(const char *media_id, filter_h filter, media_tag_cb callba
        } else
                snprintf(select_query, sizeof(select_query), SELECT_TAG_LIST_BY_MEDIA_ID, media_id);
 
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
-       SAFE_STRLCAT(select_query, QUERY_KEYWORD_SPACE, sizeof(select_query));
-
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
        SAFE_FREE(condition_query);
        SAFE_FREE(option_query);
@@ -946,7 +913,7 @@ int _media_db_get_bookmark(const char *media_id, filter_h filter, media_bookmark
        }
 #endif
 
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
@@ -1015,7 +982,7 @@ int _media_db_get_face(const char *media_id, filter_h filter, media_face_cb call
                        snprintf(select_query, sizeof(select_query), SELECT_FACE_LIST);
        }
 #endif
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
@@ -1087,7 +1054,7 @@ int _media_db_get_group_item_count_by_id(int group_id, filter_h filter, group_li
                return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
@@ -1199,7 +1166,7 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou
                return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                if (tmp_query != NULL)
                        SQLITE3_SAFE_FREE(tmp_query);
@@ -1208,8 +1175,10 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou
 
        if (group_type == MEDIA_GROUP_NONE) {
                SAFE_STRLCAT(select_query, QUERY_KEYWORD_SPACE, sizeof(select_query));
-               if (STRING_VALID(condition_query))
+               if (STRING_VALID(condition_query)) {
+                       SAFE_STRLCAT(select_query, QUERY_KEYWORD_AND, sizeof(select_query));
                        SAFE_STRLCAT(select_query, condition_query, sizeof(select_query));
+               }
                if (STRING_VALID(option_query))
                        SAFE_STRLCAT(select_query, option_query, sizeof(select_query));
 
@@ -1287,7 +1256,7 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb
                return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 #endif
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
@@ -1360,7 +1329,7 @@ int _media_db_get_group_item(const char *group_name, filter_h filter, media_info
                return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 #endif
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
@@ -1412,7 +1381,7 @@ int _media_db_get_group_item_by_union_select(const char *group_name, filter_h fi
        else
                snprintf(select_query1, sizeof(select_query1), SELECT_MEDIA_FROM_FOLDER, DB_VIEW_MEDIA, group_name);
 
-       ret = __media_db_make_query(filter1, select_query1, sizeof(select_query1), &condition_query1, &option_query1);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                SAFE_FREE(condition_query1);
                SAFE_FREE(option_query1);
@@ -1427,7 +1396,7 @@ int _media_db_get_group_item_by_union_select(const char *group_name, filter_h fi
        else
                snprintf(select_query2, sizeof(select_query2), SELECT_MEDIA_FROM_FOLDER, DB_VIEW_MEDIA, group_name);
 
-       ret = __media_db_make_query(filter2, select_query2, sizeof(select_query2), &condition_query2, &option_query2);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                SAFE_FREE(condition_query1);
                SAFE_FREE(option_query1);
@@ -1539,7 +1508,7 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter
                        snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_GROUP_NULL, __media_db_get_group_name(group));
        }
 #endif
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                if (tmp_query != NULL)
                        SQLITE3_SAFE_FREE(tmp_query);
@@ -1547,8 +1516,10 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter
        }
 
        SAFE_STRLCAT(select_query, QUERY_KEYWORD_SPACE, sizeof(select_query));
-       if (STRING_VALID(condition_query))
+       if (STRING_VALID(condition_query)) {
+               SAFE_STRLCAT(select_query, QUERY_KEYWORD_AND, sizeof(select_query));
                SAFE_STRLCAT(select_query, condition_query, sizeof(select_query));
+       }
        if (STRING_VALID(option_query))
                SAFE_STRLCAT(select_query, option_query, sizeof(select_query));
        SAFE_STRLCAT(select_query, QUERY_KEYWORD_BRACKET, sizeof(select_query));
@@ -1611,7 +1582,7 @@ int _media_db_get_media_group_item(const char *group_name, filter_h filter, medi
                        snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_GROUP_NULL, __media_db_get_group_name(group));
        }
 #endif
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                if (tmp_query != NULL)
                        SQLITE3_SAFE_FREE(tmp_query);
@@ -1663,7 +1634,7 @@ int _media_db_get_storage(filter_h filter, media_storage_cb callback, void *user
                return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
@@ -1748,7 +1719,7 @@ int _media_db_get_pvr_group_item(const char *group_name, filter_h filter, media_
                        snprintf(select_query, sizeof(select_query), SELECT_PVR_FROM_GROUP_NULL, __media_db_get_group_name(group));
        }
 
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                if (tmp_query != NULL)
                        sqlite3_free(tmp_query);
@@ -1968,7 +1939,7 @@ int _media_db_get_pvr(filter_h filter, media_pvr_cb callback, void *user_data)
        else
                SAFE_STRLCAT(select_query, SELECT_PVR_LIST, sizeof(select_query));
 
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);
@@ -2067,7 +2038,7 @@ int _media_db_get_uhd(filter_h filter, media_uhd_cb callback, void *user_data)
        else
                SAFE_STRLCAT(select_query, SELECT_UHD_LIST, sizeof(select_query));
 
-       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(select_query, condition_query, option_query, &stmt);