MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-28 08:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

[db] Remove duplication of db schema version

Browse Source
This commit is contained in:
chme 2016-11-04 14:27:41 +01:00
parent f7aa3c225b
commit f326cae142
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/db_init.c
View File

@ -217,9 +217,9 @@
" VALUES (4, '/spotify:', 0, 4294967296, 1);" " VALUES (4, '/spotify:', 0, 4294967296, 1);"
#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', '%d');"
#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', '%02d');"
struct db_init_query { struct db_init_query {
char *query; char *query;
@ -251,9 +251,6 @@ static const struct db_init_query db_init_table_queries[] =
{ Q_DIR2, "create default base directory '/file:'" }, { Q_DIR2, "create default base directory '/file:'" },
{ Q_DIR3, "create default base directory '/http:'" }, { Q_DIR3, "create default base directory '/http:'" },
{ Q_DIR4, "create default base directory '/spotify:'" }, { Q_DIR4, "create default base directory '/spotify:'" },
{ Q_SCVER_MAJOR, "set schema version major" },
{ Q_SCVER_MINOR, "set schema version minor" },
}; };
@ -389,6 +386,7 @@ db_init_indices(sqlite3 *hdl)
int int
db_init_tables(sqlite3 *hdl) db_init_tables(sqlite3 *hdl)
{ {
char *query;
char *errmsg; char *errmsg;
int i; int i;
int ret; int ret;
@ -407,6 +405,30 @@ db_init_tables(sqlite3 *hdl)
} }
} }
query = sqlite3_mprintf(Q_SCVER_MAJOR, SCHEMA_VERSION_MAJOR);
DPRINTF(E_DBG, L_DB, "DB init table query: %s\n", query);
ret = sqlite3_exec(hdl, query, NULL, NULL, &errmsg);
sqlite3_free(query);
if (ret != SQLITE_OK)
{
DPRINTF(E_FATAL, L_DB, "DB init error: %s\n", errmsg);
sqlite3_free(errmsg);
return -1;
}
query = sqlite3_mprintf(Q_SCVER_MINOR, SCHEMA_VERSION_MINOR);
DPRINTF(E_DBG, L_DB, "DB init table query: %s\n", query);
ret = sqlite3_exec(hdl, query, NULL, NULL, &errmsg);
sqlite3_free(query);
if (ret != SQLITE_OK)
{
DPRINTF(E_FATAL, L_DB, "DB init error: %s\n", errmsg);
sqlite3_free(errmsg);
return -1;
}
ret = db_init_indices(hdl); ret = db_init_indices(hdl);
return ret; return ret;