From 9e66dc9f20393dae9bcf2ffa485daab6828aed94 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 8 Nov 2016 20:19:22 +0100 Subject: [PATCH] Fix one DB query which failed for MySQL storage and could lead to DB inconsistencies. --- src/miscellaneous/databasequeries.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/miscellaneous/databasequeries.cpp b/src/miscellaneous/databasequeries.cpp index 1d5e42b40..b3d240199 100755 --- a/src/miscellaneous/databasequeries.cpp +++ b/src/miscellaneous/databasequeries.cpp @@ -617,8 +617,8 @@ int DatabaseQueries::updateMessages(QSqlDatabase db, // Now, fixup custom IDS for messages which initially did not have them, // just to keep the data consistent. if (db.exec("UPDATE Messages " - "SET custom_id = (SELECT id FROM Messages t WHERE t.id = Messages.id) " - "WHERE Messages.custom_id IS NULL OR Messages.custom_id = '';").lastError().isValid()) { + "SET custom_id = id " + "WHERE custom_id IS NULL OR custom_id = '';").lastError().isValid()) { qWarning("Failed to set custom ID for all messages: '%s'.", qPrintable(db.lastError().text())); }