-#define DB_FIELD_MEDIA_ID "media_uuid"
-#define DB_FIELD_MEDIA_PATH "path"
-#define DB_FIELD_MEDIA_DISPLAY_NAME "file_name"
-#define DB_FIELD_MEDIA_TYPE "media_type"
-#define DB_FIELD_MEDIA_MIME_TYPE "mime_type"
-#define DB_FIELD_MEDIA_SIZE "size"
-#define DB_FIELD_MEDIA_ADDED_TIME "added_time"
-#define DB_FIELD_MEDIA_MODIFIED_TIME "modified_time"
-#define DB_FIELD_MEDIA_TIMELINE "timeline"
-#define DB_FIELD_MEDIA_THUMBNAIL_PATH "thumbnail_path"
-#define DB_FIELD_MEDIA_TITLE "title"
-#define DB_FIELD_MEDIA_ALBUM "album"
-#define DB_FIELD_MEDIA_ARTIST "artist"
-#define DB_FIELD_MEDIA_ALBUM_ARTIST "album_artist"
-#define DB_FIELD_MEDIA_GENRE "genre"
-#define DB_FIELD_MEDIA_COMPOSER "composer"
-#define DB_FIELD_MEDIA_YEAR "year"
-#define DB_FIELD_MEDIA_RECORDED_DATE "recorded_date"
-#define DB_FIELD_MEDIA_COPYRIGHT "copyright"
-#define DB_FIELD_MEDIA_TRACK_NUM "track_num"
-#define DB_FIELD_MEDIA_DESCRIPTION "description"
-#define DB_FIELD_MEDIA_BITRATE "bitrate"
-#define DB_FIELD_MEDIA_BITPERSAMPLE "bitpersample"
-#define DB_FIELD_MEDIA_SAMPLERATE "samplerate"
-#define DB_FIELD_MEDIA_CHANNEL "channel"
-#define DB_FIELD_MEDIA_DURATION "duration"
-#define DB_FIELD_MEDIA_LONGITUDE "longitude"
-#define DB_FIELD_MEDIA_LATITUDE "latitude"
-#define DB_FIELD_MEDIA_ALTITUDE "altitude"
-#define DB_FIELD_MEDIA_WIDTH "width"
-#define DB_FIELD_MEDIA_HEIGHT "height"
-#define DB_FIELD_MEDIA_DATETAKEN "datetaken"
-#define DB_FIELD_MEDIA_ORIENTATION "orientation"
-#define DB_FIELD_MEDIA_RATING "rating"
-#define DB_FIELD_MEDIA_FAVOURITE "favourite"
-#define DB_FIELD_MEDIA_IS_DRM "is_drm"
-#define DB_FIELD_MEDIA_STORAGE_TYPE "storage_type"
-
-#define DB_FIELD_MEDIA_FILE_NAME_PINYIN "file_name_pinyin"
-#define DB_FIELD_MEDIA_TITLE_PINYIN "title_pinyin"
-#define DB_FIELD_MEDIA_ALBUM_PINYIN "album_pinyin"
-#define DB_FIELD_MEDIA_ARTIST_PINYIN "artist_pinyin"
-#define DB_FIELD_MEDIA_ALBUM_ARTIST_PINYIN "album_artist_pinyin"
-#define DB_FIELD_MEDIA_GENRE_PINYIN "genre_pinyin"
-#define DB_FIELD_MEDIA_COMPOSER_PINYIN "composer_pinyin"
-#define DB_FIELD_MEDIA_COPYRIGHT_PINYIN "copyright_pinyin"
-#define DB_FIELD_MEDIA_DESCRIPTION_PINYIN "description_pinyin"
-#define DB_FIELD_MEDIA_360 "is_360"
-
-/* DB field for folder */
-#define DB_FIELD_FOLDER_ID "folder_uuid"
-#define DB_FIELD_FOLDER_PATH "path"
-#define DB_FIELD_FOLDER_NAME "name"
-#define DB_FIELD_FOLDER_STORAGE_TYPE "storage_type"
-#define DB_FIELD_FOLDER_NAME_PINYIN "name_pinyin"
-
-/* DB field for playlist */
-#define DB_FIELD_PLAYLIST_ID "playlist_id"
-#define DB_FIELD_PLAYLIST_NAME "name"
-#define DB_FIELD_PLAYLIST_MEMBER_ORDER "play_order"
-#define DB_FIELD_PLAYLIST_MEDIA_COUNT "media_count"
-
-/* DB field for Storage*/
-#define DB_FIELD_STORAGE_ID "storage_uuid"
-#define DB_FIELD_STORAGE_PATH "storage_path"
-
-/* DB Query Keyword */
-#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"
-#define QUERY_KEYWORD_SPACE " "
-#define QUERY_KEYWORD_OPEN_BRACKET "("
-#define QUERY_KEYWORD_BRACKET ")"
-#define QUERY_KEYWORD_COLLATE "COLLATE "
+#define DB_FIELD_MEDIA_DISPLAY_NAME "media_display_name"
+#define DB_FIELD_MEDIA_TYPE "media_type"
+#define DB_FIELD_MEDIA_MIME_TYPE "media_mime_type"
+#define DB_FIELD_MEDIA_SIZE "media_size"
+#define DB_FIELD_MEDIA_ADDED_TIME "media_added_time"
+#define DB_FIELD_MEDIA_MODIFIED_TIME "media_modified_time"
+#define DB_FIELD_MEDIA_TITLE "media_title"
+#define DB_FIELD_MEDIA_ALBUM "media_album"
+#define DB_FIELD_MEDIA_ARTIST "media_artist"
+#define DB_FIELD_MEDIA_ALBUM_ARTIST "media_album_artist"
+#define DB_FIELD_MEDIA_GENRE "media_genre"
+#define DB_FIELD_MEDIA_COMPOSER "media_composer"
+#define DB_FIELD_MEDIA_YEAR "media_year"
+#define DB_FIELD_MEDIA_RECORDED_DATE "media_recorded_date"
+#define DB_FIELD_MEDIA_COPYRIGHT "media_copyright"
+#define DB_FIELD_MEDIA_TRACK_NUM "media_track_num"
+#define DB_FIELD_MEDIA_DESCRIPTION "media_description"
+#define DB_FIELD_MEDIA_RATING "media_rating"
+#define DB_FIELD_MEDIA_LONGITUDE "media_longitude"
+#define DB_FIELD_MEDIA_LATITUDE "media_latitude"
+#define DB_FIELD_MEDIA_ALTITUDE "media_altitude"