MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-29 23:46:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rework database version check to error out on newer databases

Browse Source
This commit is contained in:
Julien BLACHE 2010-04-27 20:48:46 +02:00
parent 262dec9daa
commit 465c10ded3
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/db.c
View File

@ -3916,14 +3916,14 @@ db_check_version(void)
ret = db_blocking_prepare_v2(Q_VER, strlen(Q_VER) + 1, &stmt, NULL); ret = db_blocking_prepare_v2(Q_VER, strlen(Q_VER) + 1, &stmt, NULL);
if (ret != SQLITE_OK) if (ret != SQLITE_OK)
{ {
DPRINTF(E_LOG, L_DB, "Could not prepare statement: %s %d\n", sqlite3_errmsg(hdl), ret); DPRINTF(E_LOG, L_DB, "Could not prepare statement: %s\n", sqlite3_errmsg(hdl));
return -1; return 1;
} }
ret = db_blocking_step(stmt); ret = db_blocking_step(stmt);
if (ret != SQLITE_ROW) if (ret != SQLITE_ROW)
{ {
DPRINTF(E_LOG, L_DB, "Could not step: %s %d\n", sqlite3_errmsg(hdl), ret); DPRINTF(E_LOG, L_DB, "Could not step: %s\n", sqlite3_errmsg(hdl));
sqlite3_finalize(stmt); sqlite3_finalize(stmt);
return -1; return -1;
@ -4061,6 +4061,13 @@ db_init(void)
ret = db_check_version(); ret = db_check_version();
if (ret < 0) if (ret < 0)
{
DPRINTF(E_FATAL, L_DB, "Database version check errored out, incompatible database\n");
db_perthread_deinit();
return -1;
}
else if (ret > 0)
{ {
DPRINTF(E_FATAL, L_DB, "Could not check database version, trying DB init\n"); DPRINTF(E_FATAL, L_DB, "Could not check database version, trying DB init\n");