Change DB upgrade from v18->v19 to v18->v18.01

This commit is contained in:
ejurgensen 2015-06-04 21:58:01 +02:00
parent 7cd96690c0
commit 271c5ff344

View File

@ -4639,12 +4639,16 @@ db_perthread_deinit(void)
" VALUES(8, 'Purchased', 0, 'media_kind = 1024', 0, '', 0, 8);" " VALUES(8, 'Purchased', 0, 'media_kind = 1024', 0, '', 0, 8);"
*/ */
#define SCHEMA_VERSION_MAJOR 19 /* Rule of thumb: Will the current version of forked-daapd work with the new
#define SCHEMA_VERSION_MINOR 00 * version of the database? If yes, then it is a minor upgrade, if no, then it
* is a major upgrade. In other words minor version upgrades permit downgrading
* forked-daapd after the database was upgraded. */
#define SCHEMA_VERSION_MAJOR 18
#define SCHEMA_VERSION_MINOR 01
#define Q_SCVER_MAJOR \ #define Q_SCVER_MAJOR \
"INSERT INTO admin (key, value) VALUES ('schema_version_major', '19');" "INSERT INTO admin (key, value) VALUES ('schema_version_major', '18');"
#define Q_SCVER_MINOR \ #define Q_SCVER_MINOR \
"INSERT INTO admin (key, value) VALUES ('schema_version_minor', '00');" "INSERT INTO admin (key, value) VALUES ('schema_version_minor', '01');"
struct db_init_query { struct db_init_query {
char *query; char *query;
@ -5900,30 +5904,30 @@ static const struct db_init_query db_upgrade_v18_queries[] =
{ U_V18_SCVER_MINOR, "set schema_version_minor to 00" }, { U_V18_SCVER_MINOR, "set schema_version_minor to 00" },
}; };
/* Upgrade from schema v18.00 to v19.00 */ /* Upgrade from schema v18.00 to v18.01 */
/* Change virtual_path for playlists: remove file extension /* Change virtual_path for playlists: remove file extension
*/ */
#define U_V19_UPDATE_PLAYLISTS_M3U \ #define U_V1801_UPDATE_PLAYLISTS_M3U \
"UPDATE playlists SET virtual_path = replace(virtual_path, '.m3u', '');" "UPDATE playlists SET virtual_path = replace(virtual_path, '.m3u', '');"
#define U_V19_UPDATE_PLAYLISTS_PLS \ #define U_V1801_UPDATE_PLAYLISTS_PLS \
"UPDATE playlists SET virtual_path = replace(virtual_path, '.pls', '');" "UPDATE playlists SET virtual_path = replace(virtual_path, '.pls', '');"
#define U_V19_UPDATE_PLAYLISTS_SMARTPL \ #define U_V1801_UPDATE_PLAYLISTS_SMARTPL \
"UPDATE playlists SET virtual_path = replace(virtual_path, '.smartpl', '');" "UPDATE playlists SET virtual_path = replace(virtual_path, '.smartpl', '');"
#define U_V19_SCVER_MAJOR \ #define U_V1801_SCVER_MAJOR \
"UPDATE admin SET value = '19' WHERE key = 'schema_version_major';" "UPDATE admin SET value = '18' WHERE key = 'schema_version_major';"
#define U_V19_SCVER_MINOR \ #define U_V1801_SCVER_MINOR \
"UPDATE admin SET value = '00' WHERE key = 'schema_version_minor';" "UPDATE admin SET value = '01' WHERE key = 'schema_version_minor';"
static const struct db_init_query db_upgrade_v19_queries[] = static const struct db_init_query db_upgrade_v1801_queries[] =
{ {
{ U_V19_UPDATE_PLAYLISTS_M3U, "update table playlists" }, { U_V1801_UPDATE_PLAYLISTS_M3U, "update table playlists" },
{ U_V19_UPDATE_PLAYLISTS_PLS, "update table playlists" }, { U_V1801_UPDATE_PLAYLISTS_PLS, "update table playlists" },
{ U_V19_UPDATE_PLAYLISTS_SMARTPL, "update table playlists" }, { U_V1801_UPDATE_PLAYLISTS_SMARTPL, "update table playlists" },
{ U_V19_SCVER_MAJOR, "set schema_version_major to 19" }, { U_V1801_SCVER_MAJOR, "set schema_version_major to 18" },
{ U_V19_SCVER_MINOR, "set schema_version_minor to 00" }, { U_V1801_SCVER_MINOR, "set schema_version_minor to 01" },
}; };
static int static int
@ -6021,7 +6025,7 @@ db_upgrade(int db_ver)
/* FALLTHROUGH */ /* FALLTHROUGH */
case 1800: case 1800:
ret = db_generic_upgrade(db_upgrade_v19_queries, sizeof(db_upgrade_v19_queries) / sizeof(db_upgrade_v19_queries[0])); ret = db_generic_upgrade(db_upgrade_V1801_queries, sizeof(db_upgrade_v1801_queries) / sizeof(db_upgrade_v1801_queries[0]));
if (ret < 0) if (ret < 0)
return -1; return -1;