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

Check database version first, if that fails, try DB init

Browse Source 
Doing it the other way around is a guaranteed way to run into issues when
a schema upgrade is needed.
This commit is contained in:
Julien BLACHE 2010-01-21 17:51:00 +01:00
parent 87abc3f432
commit 944bf3f132
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/db.c
View File

@ -3140,20 +3140,18 @@ db_init(void)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = db_create_tables();
if (ret < 0)
{
DPRINTF(E_FATAL, L_DB, "Could not create tables\n");
db_perthread_deinit();
return -1;
}
ret = db_check_version(); ret = db_check_version();
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_FATAL, L_DB, "Could not check database version\n"); DPRINTF(E_FATAL, L_DB, "Could not check database version, trying DB init\n");
db_perthread_deinit();
return -1; ret = db_create_tables();
if (ret < 0)
{
DPRINTF(E_FATAL, L_DB, "Could not create tables\n");
db_perthread_deinit();
return -1;
}
} }
files = db_files_get_count(); files = db_files_get_count();