MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert to standard SQLite functions for DB startup, creation and upgrade 

No need to use the blocking variants here as there is no concurrency during
DB startup.
This commit is contained in:
Julien BLACHE 2010-09-29 18:26:31 +02:00
parent b79cf13c95
commit 5c81144beb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/db.c
View File

@ -3932,7 +3932,7 @@ db_create_tables(void)
{ {
DPRINTF(E_DBG, L_DB, "DB init query: %s\n", db_init_queries[i].desc); DPRINTF(E_DBG, L_DB, "DB init query: %s\n", db_init_queries[i].desc);
ret = db_exec(db_init_queries[i].query, &errmsg); ret = sqlite3_exec(hdl, db_init_queries[i].query, NULL, NULL, &errmsg);
if (ret != SQLITE_OK) if (ret != SQLITE_OK)
{ {
DPRINTF(E_FATAL, L_DB, "DB init error: %s\n", errmsg); DPRINTF(E_FATAL, L_DB, "DB init error: %s\n", errmsg);
@ -3956,7 +3956,7 @@ db_generic_upgrade(const struct db_init_query *queries, int nqueries)
{ {
DPRINTF(E_DBG, L_DB, "DB upgrade query: %s\n", queries->desc); DPRINTF(E_DBG, L_DB, "DB upgrade query: %s\n", queries->desc);
ret = db_exec(queries->query, &errmsg); ret = sqlite3_exec(hdl, queries->query, NULL, NULL, &errmsg);
if (ret != SQLITE_OK) if (ret != SQLITE_OK)
{ {
DPRINTF(E_FATAL, L_DB, "DB upgrade error: %s\n", errmsg); DPRINTF(E_FATAL, L_DB, "DB upgrade error: %s\n", errmsg);
@ -4180,14 +4180,14 @@ db_check_version(void)
DPRINTF(E_DBG, L_DB, "Running query '%s'\n", Q_VER); DPRINTF(E_DBG, L_DB, "Running query '%s'\n", Q_VER);
ret = db_blocking_prepare_v2(Q_VER, strlen(Q_VER) + 1, &stmt, NULL); ret = sqlite3_prepare_v2(hdl, 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\n", sqlite3_errmsg(hdl)); DPRINTF(E_LOG, L_DB, "Could not prepare statement: %s\n", sqlite3_errmsg(hdl));
return 1; return 1;
} }
ret = db_blocking_step(stmt); ret = sqlite3_step(stmt);
if (ret != SQLITE_ROW) if (ret != SQLITE_ROW)
{ {
DPRINTF(E_LOG, L_DB, "Could not step: %s\n", sqlite3_errmsg(hdl)); DPRINTF(E_LOG, L_DB, "Could not step: %s\n", sqlite3_errmsg(hdl));
@ -4277,7 +4277,7 @@ db_check_version(void)
/* What about some housekeeping work, eh? */ /* What about some housekeeping work, eh? */
DPRINTF(E_INFO, L_DB, "Now vacuuming database, this may take some time...\n"); DPRINTF(E_INFO, L_DB, "Now vacuuming database, this may take some time...\n");
ret = db_exec(Q_VACUUM, &errmsg); ret = sqlite3_exec(hdl, Q_VACUUM, NULL, NULL, &errmsg);
if (ret != SQLITE_OK) if (ret != SQLITE_OK)
{ {
DPRINTF(E_LOG, L_DB, "Could not VACUUM database: %s\n", errmsg); DPRINTF(E_LOG, L_DB, "Could not VACUUM database: %s\n", errmsg);