From a20abafeb99f42f649b1cb126f6770c5d8394422 Mon Sep 17 00:00:00 2001 From: Kubat <mael.martin31@gmail.com> Date: Thu, 17 Feb 2022 23:48:00 +0100 Subject: [PATCH] DB-FIX: Correct informations in the db descriptions --- src/database/disk.sql | 2 +- src/database/upgrade.c | 33 +++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/database/disk.sql b/src/database/disk.sql index d2591b48..2e10fb93 100644 --- a/src/database/disk.sql +++ b/src/database/disk.sql @@ -15,7 +15,7 @@ PRAGMA foreign_keys = true; -- Version mk-7.1: -- Add field 'misc.version' -- Add field 'kara.cached_mtime' --- Add field 'kara.cached_dur' +-- Add field 'kara.cached_duration' -- Make 'kara.author_name' field 'NOT NULL' -- Make 'misc.obfuscation' default to 1 -- Version mk-7.2: diff --git a/src/database/upgrade.c b/src/database/upgrade.c index 79c8b0e4..042a37ae 100644 --- a/src/database/upgrade.c +++ b/src/database/upgrade.c @@ -36,21 +36,21 @@ struct sql_table_description { }) static struct sql_table_description sql_tables_list[] = { - DCL_SQL_TABLE(kara, // - DCL_SQL_FIELD("id", ALPHA), // - DCL_SQL_FIELD("song_name", ALPHA), // - DCL_SQL_FIELD("source_name", ALPHA), // - DCL_SQL_FIELD("category", ALPHA), // - DCL_SQL_FIELD("song_type", ALPHA), // - DCL_SQL_FIELD("song_number", ALPHA), // - DCL_SQL_FIELD("language", ALPHA), // - DCL_SQL_FIELD("file_path", ALPHA), // - DCL_SQL_FIELD("is_new", ALPHA), // - DCL_SQL_FIELD("author_name", ALPHA), // - DCL_SQL_FIELD("available", ALPHA), // - DCL_SQL_FIELD("cached_mtime", MK_7_2), // - DCL_SQL_FIELD("cached_cached_dur", MK_7_2), // - DCL_SQL_FIELD("repo_timestamp", MK_7_3)), // + DCL_SQL_TABLE(kara, // + DCL_SQL_FIELD("id", ALPHA), // + DCL_SQL_FIELD("song_name", ALPHA), // + DCL_SQL_FIELD("source_name", ALPHA), // + DCL_SQL_FIELD("category", ALPHA), // + DCL_SQL_FIELD("song_type", ALPHA), // + DCL_SQL_FIELD("song_number", ALPHA), // + DCL_SQL_FIELD("language", ALPHA), // + DCL_SQL_FIELD("file_path", ALPHA), // + DCL_SQL_FIELD("is_new", ALPHA), // + DCL_SQL_FIELD("author_name", ALPHA), // + DCL_SQL_FIELD("available", ALPHA), // + DCL_SQL_FIELD("cached_mtime", MK_7_1), // + DCL_SQL_FIELD("cached_duration", MK_7_1), // + DCL_SQL_FIELD("repo_timestamp", MK_7_3)), // DCL_SQL_TABLE(kara_type, // DCL_SQL_FIELD("id", ALPHA), // @@ -108,7 +108,8 @@ static struct sql_table_description sql_tables_list[] = { DCL_SQL_FIELD("sticker", ALPHA), // DCL_SQL_FIELD("value", ALPHA)), // }; -static size_t sql_tables_list_count = + +static const size_t sql_tables_list_count = sizeof(sql_tables_list) / sizeof(struct sql_table_description); CONSTRUCTOR_FUNCTION -- GitLab