diff --git a/src/database/update.c b/src/database/update.c index 4188a90d9f9c1de094d1da9a57bfe58b5abdfc59..39f7f5627c4bea345296d2e290708a437e58d885 100644 --- a/src/database/update.c +++ b/src/database/update.c @@ -336,21 +336,24 @@ error: LKT_DATABASE_VERSION database_get_version(volatile sqlite3 *db) { - static const char *SQL = "SELECT version FROM misc WHERE id = 42;"; - sqlite3_stmt *stmt = NULL; - LKT_DATABASE_VERSION ret_code = LKT_DATABASE_VERSION_ALPHA; + static const char *SQL = "SELECT version FROM " LKT_PROTECTED_DATABASE ".misc;"; + sqlite3_stmt *stmt = NULL; + LKT_DATABASE_VERSION ret = LKT_DATABASE_VERSION_ALPHA; SQLITE_PREPARE(db, stmt, SQL, error); + SQLITE_STEP_ROW(db, stmt, error); const char *database_version = sqlite3_column_chars(stmt, 0); + LOG_DEBUG("DB", "Got version %s", database_version); + if (NULL == database_version) - ret_code = LKT_DATABASE_VERSION_ALPHA; + ret = LKT_DATABASE_VERSION_ALPHA; else if (STR_MATCH("mk-7.1", database_version)) - ret_code = LKT_DATABASE_VERSION_MK_7_1; + ret = LKT_DATABASE_VERSION_MK_7_1; error: sqlite3_finalize(stmt); - return ret_code; + return ret; } #define sqlite_just_exec(func, query) \