From 946410de2b442d7f3ae998e91cadd00a65eb718a Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Wed, 22 Jul 2015 17:51:30 +0200 Subject: [PATCH] Fix misleading error message in servatrice; fix #1275 --- servatrice/src/servatrice_database_interface.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp index 620957b4..ea476be6 100644 --- a/servatrice/src/servatrice_database_interface.cpp +++ b/servatrice/src/servatrice_database_interface.cpp @@ -69,10 +69,13 @@ bool Servatrice_DatabaseInterface::openDatabase() if (versionQuery->next()) { const int dbversion = versionQuery->value(0).toInt(); const int expectedversion = DATABASE_SCHEMA_VERSION; - if(dbversion != expectedversion) + if(dbversion < expectedversion) { qCritical() << QString("[%1] Error opening database: the database schema version is too old, you need to run the migrations to update it from version %2 to version %3").arg(poolStr).arg(dbversion).arg(expectedversion); return false; + } else if(dbversion > expectedversion) { + qCritical() << QString("[%1] Error opening database: the database schema version %2 is too new, you need to update servatrice (this servatrice actually uses version %3)").arg(poolStr).arg(dbversion).arg(expectedversion); + return false; } } else { qCritical() << QString("[%1] Error opening database: unable to load database schema version (hint: ensure the cockatrice_schema_version contains a single record)").arg(poolStr);