Merge "Match columns of bookmark with filter keyword" into tizen

diff --combined include/media_info_private.h
index 81babf8,2580510..d1f5dbf
--- 1/include/media_info_private.h
--- 2/include/media_info_private.h
+++ b/include/media_info_private.h
@@@ -445,11 -445,6 +445,6 @@@ typedef struct _media_content_cb_data 
  #define DB_FIELD_TAG_NAME             "name"
  #define DB_FIELD_TAG_MEDIA_COUNT                      "media_count"
  
- /* DB field for bookmark */
- #define DB_FIELD_BOOKMARK_ID  "bookmark_id"
- #define DB_FIELD_BOOKMARK_MARKED_TIME "marked_time"
- #define DB_FIELD_BOOKMARK_NAME        "name"
- 
  /* DB field for Storage*/
  #define DB_FIELD_STORAGE_ID                   "storage_uuid"
  #define DB_FIELD_STORAGE_PATH         "storage_path"
@@@ -534,13 -529,13 +529,13 @@@
  #define UPDATE_PLAYLIST_ORDER_FROM_PLAYLIST_MAP               "UPDATE "DB_TABLE_PLAYLIST_MAP" SET play_order=%d WHERE playlist_id=%d AND _id=%d;"
  
  /* Bookmark */
- #define INSERT_BOOKMARK_TO_BOOKMARK                   "INSERT INTO "DB_TABLE_BOOKMARK" (media_uuid, marked_time, thumbnail_path, name) VALUES ('%q', '%d', %Q, %Q)"
+ #define INSERT_BOOKMARK_TO_BOOKMARK                   "INSERT INTO "DB_TABLE_BOOKMARK" (media_uuid, bookmark_marked_time, thumbnail_path, bookmark_name) VALUES ('%q', '%d', %Q, %Q)"
  #define SELECT_BOOKMARK_COUNT_BY_MEDIA_ID             "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN" AND b.media_uuid='%s'"
- #define SELECT_BOOKMARK_LIST                                          "SELECT bookmark_id, b.media_uuid, marked_time, b.thumbnail_path, name FROM "BOOKMARK_MEDIA_JOIN
- #define SELECT_BOOKMARK_LIST_BY_MEDIA_ID                      "SELECT bookmark_id, b.media_uuid, marked_time, b.thumbnail_path, name FROM "BOOKMARK_MEDIA_JOIN" AND b.media_uuid='%s'"
- #define SELECT_BOOKMARK_ID_FROM_BOOKMARK               "SELECT bookmark_id FROM "DB_TABLE_BOOKMARK" WHERE media_uuid='%s' AND marked_time=%d"
+ #define SELECT_BOOKMARK_LIST                                          "SELECT bookmark_id, b.media_uuid, bookmark_marked_time, b.thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN
+ #define SELECT_BOOKMARK_LIST_BY_MEDIA_ID                      "SELECT bookmark_id, b.media_uuid, bookmark_marked_time, b.thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN" AND b.media_uuid='%s'"
+ #define SELECT_BOOKMARK_ID_FROM_BOOKMARK               "SELECT bookmark_id FROM "DB_TABLE_BOOKMARK" WHERE media_uuid='%s' AND bookmark_marked_time=%d"
  
- #define UPDATE_BOOKMARK_FROM_BOOKMARK         "UPDATE "DB_TABLE_BOOKMARK" SET name=%Q WHERE bookmark_id=%d;"
+ #define UPDATE_BOOKMARK_FROM_BOOKMARK         "UPDATE "DB_TABLE_BOOKMARK" SET bookmark_name=%Q WHERE bookmark_id=%d;"
  
  /* Update Meta*/
  #define UPDATE_IMAGE_META_FROM_MEDIA  "UPDATE '%s' SET orientation=%d WHERE media_uuid='%q'"
@@@ -573,7 -568,6 +568,7 @@@
  #define INSERT_FACE_TO_FACE                           "INSERT INTO "DB_TABLE_FACE" (media_uuid, face_rect_x , face_rect_y, face_rect_w, face_rect_h, orientation, media_face_tag) VALUES ('%q', %d, %d, %d, %d, %d, %Q);"
  #define UPDATE_FACE_TO_FACE                   "UPDATE "DB_TABLE_FACE" SET face_rect_x=%d, face_rect_y=%d, face_rect_w=%d, face_rect_h=%d, orientation=%d, media_face_tag=%Q WHERE media_face_id=%d"
  #define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID           "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_uuid='%q' AND validity=1"
 +#define SELECT_IMAGE_COUNT_FROM_MEDIA_BY_ID           "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_uuid='%q' AND media_type=0 AND validity=1"
  #define SELECT_FACE_COUNT                                     "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN
  #define SELECT_FACE_COUNT_BY_MEDIA_ID         "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
  #define SELECT_FACE_LIST                                      "SELECT media_face_id, fa.media_uuid, face_rect_x, face_rect_y, face_rect_w, face_rect_h, fa.orientation, media_face_tag FROM "FACE_MEDIA_JOIN

diff --combined include_product/media_info_private.h
index 453be80,357a893..3fe227f
--- 1/include_product/media_info_private.h
--- 2/include_product/media_info_private.h
+++ b/include_product/media_info_private.h
@@@ -558,11 -558,6 +558,6 @@@ typedef struct _media_content_scan_cb_d
  #define DB_FIELD_TAG_NAME             "name"
  #define DB_FIELD_TAG_MEDIA_COUNT                      "media_count"
  
- /* DB field for bookmark */
- #define DB_FIELD_BOOKMARK_ID  "bookmark_id"
- #define DB_FIELD_BOOKMARK_MARKED_TIME "marked_time"
- #define DB_FIELD_BOOKMARK_NAME        "name"
- 
  /* DB field for Storage*/
  #define DB_FIELD_STORAGE_ID                   "storage_uuid"
  #define DB_FIELD_STORAGE_PATH         "storage_path"
@@@ -711,13 -706,13 +706,13 @@@
  #define UPDATE_PLAYLIST_ORDER_FROM_PLAYLIST_MAP               "UPDATE "DB_TABLE_PLAYLIST_MAP" SET play_order=%d WHERE playlist_id=%d AND _id=%d;"
  
  /* Bookmark */
- #define INSERT_BOOKMARK_TO_BOOKMARK                   "INSERT INTO "DB_TABLE_BOOKMARK" (media_uuid, marked_time, thumbnail_path, name) VALUES ('%q', '%d', %Q, %Q)"
+ #define INSERT_BOOKMARK_TO_BOOKMARK                   "INSERT INTO "DB_TABLE_BOOKMARK" (media_uuid, bookmark_marked_time, thumbnail_path, bookmark_name) VALUES ('%q', '%d', %Q, %Q)"
  #define SELECT_BOOKMARK_COUNT_BY_MEDIA_ID             "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN" AND b.media_uuid='%s'"
- #define SELECT_BOOKMARK_LIST                                          "SELECT bookmark_id, b.media_uuid, marked_time, b.thumbnail_path, name FROM "BOOKMARK_MEDIA_JOIN
- #define SELECT_BOOKMARK_LIST_BY_MEDIA_ID                      "SELECT bookmark_id, b.media_uuid, marked_time, b.thumbnail_path, name FROM "BOOKMARK_MEDIA_JOIN" AND b.media_uuid='%s'"
- #define SELECT_BOOKMARK_ID_FROM_BOOKMARK               "SELECT bookmark_id FROM "DB_TABLE_BOOKMARK" WHERE media_uuid='%s' AND marked_time=%d"
+ #define SELECT_BOOKMARK_LIST                                          "SELECT bookmark_id, b.media_uuid, bookmark_marked_time, b.thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN
+ #define SELECT_BOOKMARK_LIST_BY_MEDIA_ID                      "SELECT bookmark_id, b.media_uuid, bookmark_marked_time, b.thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN" AND b.media_uuid='%s'"
+ #define SELECT_BOOKMARK_ID_FROM_BOOKMARK               "SELECT bookmark_id FROM "DB_TABLE_BOOKMARK" WHERE media_uuid='%s' AND bookmark_marked_time=%d"
  
- #define UPDATE_BOOKMARK_FROM_BOOKMARK         "UPDATE "DB_TABLE_BOOKMARK" SET name=%Q WHERE bookmark_id=%d;"
+ #define UPDATE_BOOKMARK_FROM_BOOKMARK         "UPDATE "DB_TABLE_BOOKMARK" SET bookmark_name=%Q WHERE bookmark_id=%d;"
  
  /* Update Meta*/
  #define UPDATE_IMAGE_META_FROM_MEDIA  "UPDATE '%s' SET orientation=%d WHERE media_uuid='%q'"
@@@ -750,7 -745,6 +745,7 @@@
  #define INSERT_FACE_TO_FACE                           "INSERT INTO "DB_TABLE_FACE" (media_uuid, face_rect_x , face_rect_y, face_rect_w, face_rect_h, orientation, media_face_tag) VALUES ('%q', %d, %d, %d, %d, %d, %Q);"
  #define UPDATE_FACE_TO_FACE                   "UPDATE "DB_TABLE_FACE" SET face_rect_x=%d, face_rect_y=%d, face_rect_w=%d, face_rect_h=%d, orientation=%d, media_face_tag=%Q WHERE media_face_id=%d"
  #define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID           "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_uuid='%q' AND validity=1"
 +#define SELECT_IMAGE_COUNT_FROM_MEDIA_BY_ID           "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_uuid='%q' AND media_type=0 AND validity=1"
  #define SELECT_FACE_COUNT                                     "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN
  #define SELECT_FACE_COUNT_BY_MEDIA_ID         "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
  #define SELECT_FACE_LIST                                      "SELECT media_face_id, fa.media_uuid, face_rect_x, face_rect_y, face_rect_w, face_rect_h, fa.orientation, media_face_tag FROM "FACE_MEDIA_JOIN