making the latest schema evolution failsafe

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 cb55f1d..12a34b3 100644 (file)
--- 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 3858455..8400301 100644 (file)
--- 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 042ce3a..b2fd697 100644 (file)
--- 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 e092be9..ccbc6bd 100644 (file)
--- 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;
   }