Unify duplicated code regarding view table

Change-Id: I54e7e7a9e2af8155fb049167e787c006a71e7424

diff --git a/src/common/media-svc-db-utils.c b/src/common/media-svc-db-utils.c
index f3b717b..8a0d9f1 100755 (executable)
--- a/src/common/media-svc-db-utils.c
+++ b/src/common/media-svc-db-utils.c
@@ -228,21 +228,22 @@ static int __create_tag_view(uid_t uid)
        return ret;
 }
 
-static int __media_svc_rebuild_view_query(sqlite3 *db_handle, uid_t uid)
+static int __drop_views(uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
        char *sql = NULL;
 
-       /*drop playlist_view, tag_view */
-       sql = sqlite3_mprintf(MEDIA_SVC_DB_QUERY_DROP_VIEW, MEDIA_SVC_DB_VIEW_PLAYLIST);
-       ret = _media_svc_sql_query(sql, uid);
-       SQLITE3_SAFE_FREE(sql);
-       media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
+       sql = sqlite3_mprintf("DROP VIEW IF EXISTS %q;DROP VIEW IF EXISTS %q;DROP VIEW IF EXISTS %q",   MEDIA_SVC_DB_VIEW_PLAYLIST, MEDIA_SVC_DB_VIEW_TAG, MEDIA_SVC_DB_VIEW_MEDIA);
 
-       sql = sqlite3_mprintf(MEDIA_SVC_DB_QUERY_DROP_VIEW, MEDIA_SVC_DB_VIEW_TAG);
        ret = _media_svc_sql_query(sql, uid);
        SQLITE3_SAFE_FREE(sql);
-       media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
+
+       return ret;
+}
+
+static int __media_svc_rebuild_view_query(sqlite3 *db_handle, uid_t uid)
+{
+       int ret = MS_MEDIA_ERR_NONE;
 
        /*create playlist_view */
        ret = __create_playlist_view(uid);
@@ -890,14 +891,6 @@ static int __update_db_from_V6_to_V8(uid_t uid)    //tizen 4.0 to 5.5
        int ret = MS_MEDIA_ERR_NONE;
        char *sql = NULL;
 
-       /*Drop view first*/
-       sql = sqlite3_mprintf("DROP VIEW IF EXISTS %q;DROP VIEW IF EXISTS %q;DROP VIEW IF EXISTS %q",
-               MEDIA_SVC_DB_VIEW_PLAYLIST, MEDIA_SVC_DB_VIEW_TAG, MEDIA_SVC_DB_VIEW_MEDIA);
-
-       ret = _media_svc_sql_query(sql, uid);
-       SQLITE3_SAFE_FREE(sql);
-       media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "fail to _media_svc_sql_query [%d]", ret);
-
        /******Upgrade Media Table******/
        /* remove user data columns */
        ret = __alter_and_rename_table(MEDIA_SVC_DB_TABLE_MEDIA, uid);
@@ -1001,14 +994,6 @@ static int __update_db_to_latest(int cur_version, uid_t uid)      //tizen 5.0(and bef
        int ret = MS_MEDIA_ERR_NONE;
        char *sql = NULL;
 
-       /*Drop view first*/
-       sql = sqlite3_mprintf("DROP VIEW IF EXISTS %q;DROP VIEW IF EXISTS %q;DROP VIEW IF EXISTS %q",
-               MEDIA_SVC_DB_VIEW_PLAYLIST, MEDIA_SVC_DB_VIEW_TAG, MEDIA_SVC_DB_VIEW_MEDIA);
-
-       ret = _media_svc_sql_query(sql, uid);
-       SQLITE3_SAFE_FREE(sql);
-       media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "fail to _media_svc_sql_query [%d]", ret);
-
        if (cur_version == USER_V6) {
                /* Drop trigger first */
                sql = sqlite3_mprintf("DROP TRIGGER IF EXISTS %q_%q;DROP TRIGGER IF EXISTS %q_%q;",
@@ -1209,6 +1194,10 @@ static int __media_svc_db_upgrade(sqlite3 *db_handle, int cur_version, uid_t uid
                goto ERROR;
        }
 
+       /*drop media_view, playlist_view, tag_view */
+       ret = __drop_views(uid);
+       media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
+
        /* Upgrade issue tizen 4.0 to 5.5 */
        if (cur_version == USER_V6) {
                ret = __update_db_from_V6_to_V8(uid);

diff --git a/src/include/common/media-svc-env.h b/src/include/common/media-svc-env.h
index 0015291..3fc0206 100755 (executable)
--- a/src/include/common/media-svc-env.h
+++ b/src/include/common/media-svc-env.h
@@ -121,8 +121,6 @@ extern "C" {
                        LEFT OUTER JOIN media ON (tag_map.media_id = media.media_id AND media.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.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;"
-
 
 
 #define MEDIA_SVC_METADATA_LEN_MAX                     512                     /**< Length of metadata*/