From f3ed7ef09edd9955057558acc7ca6c54f0c533d7 Mon Sep 17 00:00:00 2001 From: Christian Hohnstaedt Date: Sat, 30 Mar 2024 12:47:17 +0100 Subject: [PATCH] Fix missing takeys table in new databases The "takeys" table was only created for existing databases. New databases were immediately marked as version "8" databases and the tykeys table creation was skipped. --- lib/database_model.cpp | 6 +++++- lib/database_schema.cpp | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/database_model.cpp b/lib/database_model.cpp index 9fcbd958..781e2629 100644 --- a/lib/database_model.cpp +++ b/lib/database_model.cpp @@ -73,7 +73,11 @@ const QString &database_model::detect_provider() QSqlError database_model::initSqlDB() { #define MAX_SCHEMAS 8 -#define SCHEMA_VERSION "8" +/* The initial SQL creation data creates a version "7" + * database. Then an update to Version 8 by creating "takeys" + * is executed. + */ +#define INITIAL_SCHEMA_VERSION "7" QStringList schemas[MAX_SCHEMAS]; diff --git a/lib/database_schema.cpp b/lib/database_schema.cpp index 0be8ec2f..7ae53845 100644 --- a/lib/database_schema.cpp +++ b/lib/database_schema.cpp @@ -32,7 +32,7 @@ << "CREATE TABLE settings (" "key_ CHAR(20) UNIQUE, " // mySql does not like 'key' or 'option" "value " B64_BLOB ")" -<< "INSERT INTO settings (key_, value) VALUES ('schema', '" SCHEMA_VERSION "')" +<< "INSERT INTO settings (key_, value) VALUES ('schema', '" INITIAL_SCHEMA_VERSION "')" /* * All items (keys, tokens, requests, certs, crls, templates)