From de6fd75928284a7c8788e00a36e5de7e64b9e168 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Mon, 29 Dec 2008 20:26:24 +0100 Subject: [PATCH] making the latest schema evolution failsafe --- src/core/SQL/SQLite/13/upgrade_000_create_buffer_user_idx.sql | 2 +- src/core/SQL/SQLite/13/upgrade_010_create_buffer_cname_idx.sql | 2 +- src/core/SQL/SQLite/13/upgrade_020_create_buffer_cname_idx.sql | 2 +- src/core/abstractsqlstorage.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/SQL/SQLite/13/upgrade_000_create_buffer_user_idx.sql b/src/core/SQL/SQLite/13/upgrade_000_create_buffer_user_idx.sql index cb55f1da..12a34b3b 100644 --- a/src/core/SQL/SQLite/13/upgrade_000_create_buffer_user_idx.sql +++ b/src/core/SQL/SQLite/13/upgrade_000_create_buffer_user_idx.sql @@ -1 +1 @@ -CREATE INDEX buffer_user_idx ON buffer(userid) +CREATE INDEX IF NOT EXISTS buffer_user_idx ON buffer(userid) diff --git a/src/core/SQL/SQLite/13/upgrade_010_create_buffer_cname_idx.sql b/src/core/SQL/SQLite/13/upgrade_010_create_buffer_cname_idx.sql index 3858455e..8400301e 100644 --- a/src/core/SQL/SQLite/13/upgrade_010_create_buffer_cname_idx.sql +++ b/src/core/SQL/SQLite/13/upgrade_010_create_buffer_cname_idx.sql @@ -1,2 +1,2 @@ -CREATE UNIQUE INDEX buffer_cname_idx +CREATE UNIQUE INDEX IF NOT EXISTS buffer_cname_idx ON buffer(userid, networkid, buffercname) diff --git a/src/core/SQL/SQLite/13/upgrade_020_create_buffer_cname_idx.sql b/src/core/SQL/SQLite/13/upgrade_020_create_buffer_cname_idx.sql index 042ce3a3..b2fd6970 100644 --- a/src/core/SQL/SQLite/13/upgrade_020_create_buffer_cname_idx.sql +++ b/src/core/SQL/SQLite/13/upgrade_020_create_buffer_cname_idx.sql @@ -1,2 +1,2 @@ -CREATE UNIQUE INDEX buffer_idx +CREATE UNIQUE INDEX IF NOT EXISTS buffer_idx ON buffer(userid, networkid, buffername) diff --git a/src/core/abstractsqlstorage.cpp b/src/core/abstractsqlstorage.cpp index e092be90..ccbc6bd9 100644 --- a/src/core/abstractsqlstorage.cpp +++ b/src/core/abstractsqlstorage.cpp @@ -100,7 +100,7 @@ bool AbstractSqlStorage::init(const QVariantMap &settings) { } if(installedSchemaVersion() < schemaVersion()) { - qWarning() << "Installed Schema is not up to date. Upgrading..."; + qWarning() << qPrintable(tr("Installed Schema (version %1) is not up to date. Upgrading to version %2...").arg(installedSchemaVersion()).arg(schemaVersion())); if(!upgradeDb()) return false; } -- 2.20.1