Remove storage_name column

1. Remove storage name column from DB
2. Remove parameter related with storage name from functions

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

diff --git a/include/media-svc.h b/include/media-svc.h
index f547521..68568c7 100755 (executable)
--- a/include/media-svc.h
+++ b/include/media-svc.h
@@ -70,7 +70,7 @@ void media_svc_destroy_content_info(media_svc_content_info_s *content_info);
 
 int media_svc_generate_uuid(char **uuid);
 int media_svc_check_storage(MediaSvcHandle *handle, const char *storage_id, char **storage_path, int *validity, uid_t uid);
-int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, const char *storage_path, media_svc_storage_type_e storage_type, uid_t uid);
+int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_path, media_svc_storage_type_e storage_type, uid_t uid);
 int media_svc_update_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_path, uid_t uid);
 int media_svc_set_storage_validity(MediaSvcHandle *handle, const char *storage_id, int validity, uid_t uid);
 int media_svc_get_storage_id(MediaSvcHandle *handle, const char *path, char *storage_id, uid_t uid);

diff --git a/plugin/media-content-plugin.c b/plugin/media-content-plugin.c
index 5514a46..9c7fb23 100755 (executable)
--- a/plugin/media-content-plugin.c
+++ b/plugin/media-content-plugin.c
@@ -479,7 +479,7 @@ int check_storage(void * handle, const char *storage_id, char **storage_path, in
        return MEDIA_SVC_PLUGIN_ERROR_NONE;
 }
 
-int insert_storage(void *handle, const char *storage_id, int storage_type, const char *storage_name, const char *storage_path, uid_t uid, char **err_msg)
+int insert_storage(void *handle, const char *storage_id, int storage_type, const char *storage_path, uid_t uid, char **err_msg)
 {
        int ret = MEDIA_SVC_PLUGIN_ERROR_NONE;
 
@@ -488,7 +488,7 @@ int insert_storage(void *handle, const char *storage_id, int storage_type, const
                return MEDIA_SVC_PLUGIN_ERROR;
        }
 
-       ret = media_svc_insert_storage(handle, storage_id, storage_name, storage_path, storage_type, uid);
+       ret = media_svc_insert_storage(handle, storage_id, storage_path, storage_type, uid);
        if (ret < 0) {
                __set_error_message(ret, err_msg);
                return MEDIA_SVC_PLUGIN_ERROR;

diff --git a/src/common/media-svc-db-utils.c b/src/common/media-svc-db-utils.c
index f8b01df..9ae5a4a 100755 (executable)
--- a/src/common/media-svc-db-utils.c
+++ b/src/common/media-svc-db-utils.c
@@ -765,8 +765,6 @@ int _media_svc_init_table_query(const char *event_table_name)
        /*storage*/
        ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_STORAGE], "storage_uuid", MEDIA_SVC_DB_TYPE_TEXT, "PRIMARY KEY", USER_V3, 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_STORAGE], "storage_name", MEDIA_SVC_DB_TYPE_TEXT, NULL, USER_V3, 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_STORAGE], "storage_path", MEDIA_SVC_DB_TYPE_TEXT, "NOT NULL", USER_V3, 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_STORAGE], "storage_type", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 0", USER_V3, NULL, false, false, false);

diff --git a/src/common/media-svc-storage.c b/src/common/media-svc-storage.c
index 65e211a..fde30cf 100755 (executable)
--- a/src/common/media-svc-storage.c
+++ b/src/common/media-svc-storage.c
@@ -69,11 +69,11 @@ int _media_svc_check_storage(sqlite3 *handle, const char *storage_id, char **sto
        return MS_MEDIA_ERR_NONE;
 }
 
-int _media_svc_append_storage(const char *storage_id, const char *storage_name, const char *storage_path, media_svc_storage_type_e storage_type, uid_t uid)
+int _media_svc_append_storage(const char *storage_id, const char *storage_path, media_svc_storage_type_e storage_type, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
-       char *sql = sqlite3_mprintf("INSERT INTO %q (storage_uuid, storage_name, storage_path, storage_type) values (%Q, %Q, %Q, %d); ",
-                                               MEDIA_SVC_DB_TABLE_STORAGE, storage_id, storage_name, storage_path, storage_type);
+       char *sql = sqlite3_mprintf("INSERT INTO %q (storage_uuid, storage_path, storage_type) values (%Q, %Q, %d);",
+                                               MEDIA_SVC_DB_TABLE_STORAGE, storage_id, storage_path, storage_type);
 
        ret = _media_svc_sql_query(sql, uid);
        SQLITE3_SAFE_FREE(sql);

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index bd13e0b..3efed61 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -1380,7 +1380,7 @@ int media_svc_update_storage(MediaSvcHandle *handle, const char *storage_id, con
        return _media_svc_update_storage_path(db_handle, storage_id, storage_path, uid);
 }
 
-int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_name, const char *storage_path, media_svc_storage_type_e storage_type, uid_t uid)
+int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, const char *storage_path, media_svc_storage_type_e storage_type, uid_t uid)
 {
        int ret = MS_MEDIA_ERR_NONE;
        sqlite3 *db_handle = (sqlite3 *)handle;
@@ -1390,7 +1390,7 @@ int media_svc_insert_storage(MediaSvcHandle *handle, const char *storage_id, con
        media_svc_retvm_if(storage_path == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "storage_path is NULL");
        media_svc_retvm_if(__media_svc_check_storage(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
-       ret = _media_svc_append_storage(storage_id, storage_name, storage_path, storage_type, uid);
+       ret = _media_svc_append_storage(storage_id, storage_path, storage_type, uid);
        media_svc_retvm_if(ret != MS_MEDIA_ERR_NONE, ret, "append storage failed : %d", ret);
 
        ret = _media_svc_create_media_table_with_id(storage_id, uid);

diff --git a/src/include/common/media-svc-storage.h b/src/include/common/media-svc-storage.h
index 6276e15..8285f53 100755 (executable)
--- a/src/include/common/media-svc-storage.h
+++ b/src/include/common/media-svc-storage.h
@@ -25,7 +25,7 @@
 #include <sqlite3.h>
 
 int _media_svc_check_storage(sqlite3 *handle, const char *storage_id, char **storage_path, int *validity, uid_t uid);
-int _media_svc_append_storage(const char *storage_id, const char *storage_name, const char *storage_path, media_svc_storage_type_e storage_type, uid_t uid);
+int _media_svc_append_storage(const char *storage_id, const char *storage_path, media_svc_storage_type_e storage_type, uid_t uid);
 int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, const char *path, uid_t uid);
 int _media_svc_delete_invalid_storage(sqlite3 *handle, media_svc_storage_type_e storage_type, uid_t uid);
 int _media_svc_update_storage_validity(const char *storage_id, int validity, uid_t uid);