Change path to folder_path in folder table

1. Modify column name
2. Change media, folder join query
3. Remove alias from media and folder table

Change-Id: Id40d09f421d9a763c9e1ede30abb4a061bb4a3a8
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 3af0983..3bd75a0 100755 (executable)
--- a/src/common/media-svc-db-utils.c
+++ b/src/common/media-svc-db-utils.c
@@ -650,7 +650,7 @@ int _media_svc_init_table_query(const char *event_table_name)
        /*folder*/
        ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FOLDER], "folder_uuid", MEDIA_SVC_DB_TYPE_TEXT, "PRIMARY KEY", USER_V2, NULL, false, false, false);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-       ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FOLDER], "path", MEDIA_SVC_DB_TYPE_TEXT, "NOT NULL", USER_V2, NULL, true, false, false);
+       ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FOLDER], "folder_path", MEDIA_SVC_DB_TYPE_TEXT, "NOT NULL", USER_V2, NULL, true, false, false);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
        ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FOLDER], "name", MEDIA_SVC_DB_TYPE_TEXT, "NOT NULL", USER_V2, NULL, false, false, false);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);

diff --git a/src/common/media-svc-media-folder.c b/src/common/media-svc-media-folder.c
index 43f2f38..b268ee6 100755 (executable)
--- a/src/common/media-svc-media-folder.c
+++ b/src/common/media-svc-media-folder.c
@@ -35,7 +35,7 @@ int _media_svc_get_folder_id_by_foldername(sqlite3 *handle, const char *storage_
        sqlite3_stmt *sql_stmt = NULL;
        char *sql = NULL;
 
-       sql = sqlite3_mprintf("SELECT folder_uuid FROM %q WHERE storage_uuid = '%q' AND path = '%q';", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, folder_name);
+       sql = sqlite3_mprintf("SELECT folder_uuid FROM %q WHERE storage_uuid = '%q' AND folder_path = '%q';", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, folder_name);
 
        ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt);
        if (ret != MS_MEDIA_ERR_NONE) {
@@ -60,7 +60,7 @@ int _media_svc_get_folder_id_by_foldername_with_validity(sqlite3 *handle, const
        sqlite3_stmt *sql_stmt = NULL;
        char *sql = NULL;
 
-       sql = sqlite3_mprintf("SELECT folder_uuid, validity FROM %q WHERE storage_uuid = '%q' AND path = '%q';", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, folder_name);
+       sql = sqlite3_mprintf("SELECT folder_uuid, validity FROM %q WHERE storage_uuid = '%q' AND folder_path = '%q';", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, folder_name);
 
        ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt);
        if (ret != MS_MEDIA_ERR_NONE) {
@@ -96,7 +96,7 @@ static int __media_svc_append_folder(const char *storage_id, ms_user_storage_typ
                _media_svc_get_pinyin_str(folder_name, &folder_name_pinyin);
        /* Sometime SQLITE3 returns NO_RECORD, so need to consider conflict case.. */
        media_svc_debug("UNIQUE:path[%s], storage_uuid[%s]", folder_path, storage_id);
-       char *sql = sqlite3_mprintf("INSERT OR IGNORE INTO %q (folder_uuid, path, name, storage_uuid, storage_type, modified_time, name_pinyin) values (%Q, %Q, %Q, %Q, '%d', '%d', %Q); ",
+       char *sql = sqlite3_mprintf("INSERT OR IGNORE INTO %q (folder_uuid, folder_path, name, storage_uuid, storage_type, modified_time, name_pinyin) values (%Q, %Q, %Q, %Q, '%d', '%d', %Q); ",
                                MEDIA_SVC_DB_TABLE_FOLDER, folder_id, folder_path, folder_name, storage_id, storage_type, folder_modified_date, folder_name_pinyin);
 
        if (!stack_query) {
@@ -310,7 +310,7 @@ int _media_svc_get_and_append_folder_id_by_folder_path(sqlite3 *handle, const ch
        if (ret == MS_MEDIA_ERR_DB_NO_RECORD) {
                ret = __media_svc_get_and_append_parent_folder(handle, storage_id, path_name, storage_type, folder_id, uid);
        } else {
-               sql = sqlite3_mprintf("UPDATE %q SET validity=1 WHERE storage_uuid = '%q' AND path = '%q';", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, path);
+               sql = sqlite3_mprintf("UPDATE %q SET validity=1 WHERE storage_uuid = '%q' AND folder_path = '%q';", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, path);
                if (!stack_query) {
                        ret = _media_svc_sql_query(sql, uid);
                        SQLITE3_SAFE_FREE(sql);
@@ -335,10 +335,10 @@ int _media_svc_set_folder_validity(sqlite3 *handle, const char *storage_id, cons
                media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "_media_svc_get_folder_id_by_foldername fail");
                media_svc_retvm_if(!STRING_VALID(start_path_id), MS_MEDIA_ERR_INVALID_PARAMETER, "start_path_id is NULL");
 
-               sql = sqlite3_mprintf("UPDATE %q SET validity = %d WHERE storage_uuid = '%q' AND (path LIKE '%q/%%' OR folder_uuid ='%q');",
+               sql = sqlite3_mprintf("UPDATE %q SET validity = %d WHERE storage_uuid = '%q' AND (folder_path LIKE '%q/%%' OR folder_uuid ='%q');",
                                                MEDIA_SVC_DB_TABLE_FOLDER, validity, storage_id, start_path, start_path_id);
        } else {
-               sql = sqlite3_mprintf("UPDATE %q SET validity = %d WHERE storage_uuid = '%q' AND path = '%q';",
+               sql = sqlite3_mprintf("UPDATE %q SET validity = %d WHERE storage_uuid = '%q' AND folder_path = '%q';",
                                                MEDIA_SVC_DB_TABLE_FOLDER, validity, storage_id, start_path);
        }
 
@@ -363,7 +363,7 @@ int _media_svc_count_folder_with_path(sqlite3 *handle, const char *storage_id, c
        media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
        media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
 
-       sql = sqlite3_mprintf("SELECT count(*) FROM %q WHERE (storage_uuid='%q' AND path='%q')", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, path);
+       sql = sqlite3_mprintf("SELECT count(*) FROM %q WHERE (storage_uuid='%q' AND folder_path='%q')", MEDIA_SVC_DB_TABLE_FOLDER, storage_id, path);
 
        ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt);
 

diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c
index a0bdeca..fd8fd4b 100755 (executable)
--- a/src/common/media-svc-media.c
+++ b/src/common/media-svc-media.c
@@ -568,7 +568,7 @@ int _media_svc_get_noti_info(sqlite3 *handle, const char *storage_id, const char
        if (update_item == MS_MEDIA_ITEM_FILE)
                sql = sqlite3_mprintf("SELECT media_uuid, media_type, mime_type FROM '%q' WHERE path=%Q", storage_id, path);
        else if (update_item == MS_MEDIA_ITEM_DIRECTORY)
-               sql = sqlite3_mprintf("SELECT folder_uuid FROM '%q' WHERE path=%Q AND storage_uuid='%q'", MEDIA_SVC_DB_TABLE_FOLDER, path, storage_id);
+               sql = sqlite3_mprintf("SELECT folder_uuid FROM '%q' WHERE folder_path=%Q AND storage_uuid='%q'", MEDIA_SVC_DB_TABLE_FOLDER, path, storage_id);
        else {
                media_svc_error("_media_svc_get_noti_info failed : update item");
                return MS_MEDIA_ERR_INVALID_PARAMETER;

diff --git a/src/common/media-svc-storage.c b/src/common/media-svc-storage.c
index fbca9ae..7ab1b07 100755 (executable)
--- a/src/common/media-svc-storage.c
+++ b/src/common/media-svc-storage.c
@@ -109,7 +109,7 @@ int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, cons
        }
 
        /*Folder table update*/
-       sql = sqlite3_mprintf("UPDATE '%q' SET path=REPLACE(path, %Q, %Q) WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_FOLDER, old_storage_path, path, storage_id);
+       sql = sqlite3_mprintf("UPDATE '%q' SET folder_path=REPLACE(folder_path, %Q, %Q) WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_FOLDER, old_storage_path, path, storage_id);
        ret = _media_svc_sql_query(sql, uid);
        SQLITE3_SAFE_FREE(sql);
        if (ret != MS_MEDIA_ERR_NONE) {