Skip to content
Extraits de code Groupes Projets
Vérifiée Valider 77a8faef rédigé par Kubat's avatar Kubat
Parcourir les fichiers

DB: Fix the get version string (get column in a query that wasn't executed)

parent b60b92ba
Branches
Étiquettes
1 requête de fusion!157Caching for karas & refactor & others
......@@ -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;";
static const char *SQL = "SELECT version FROM " LKT_PROTECTED_DATABASE ".misc;";
sqlite3_stmt *stmt = NULL;
LKT_DATABASE_VERSION ret_code = LKT_DATABASE_VERSION_ALPHA;
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) \
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter