changes to identities are now saved again properly

diff --git a/src/core/SQL/SQLite/13/delete_nicks.sql b/src/core/SQL/SQLite/13/delete_nicks.sql
index 8018d63..8aac599 100644 (file)
--- a/src/core/SQL/SQLite/13/delete_nicks.sql
+++ b/src/core/SQL/SQLite/13/delete_nicks.sql
@@ -1,2 +1,2 @@
 DELETE FROM identity_nick
 DELETE FROM identity_nick

-WHERE userid = :userid
+WHERE identityid = :identityid;

diff --git a/src/core/SQL/SQLite/13/update_identity.sql b/src/core/SQL/SQLite/13/update_identity.sql
index 1087e59..c25a708 100644 (file)
--- a/src/core/SQL/SQLite/13/update_identity.sql
+++ b/src/core/SQL/SQLite/13/update_identity.sql
@@ -1,6 +1,6 @@
 UPDATE identity
 SET    identityname = :identityname,
 UPDATE identity
 SET    identityname = :identityname,

-       relname = :realname,
+       realname = :realname,

        awaynick = :awaynick,
        awaynickenabled = :awaynickenabled,
        awayreason = :awayreason,
        awaynick = :awaynick,
        awaynickenabled = :awaynickenabled,
        awayreason = :awayreason,

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index 718dc59..2876d5c 100644 (file)
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -283,11 +283,13 @@ bool SqliteStorage::updateIdentity(UserId user, const CoreIdentity &identity) {
 #endif
   query.bindValue(":identityid", identity.id().toInt());
   safeExec(query);
 #endif
   query.bindValue(":identityid", identity.id().toInt());
   safeExec(query);

+  watchQuery(query);

 
   QSqlQuery deleteNickQuery(logDb());
   deleteNickQuery.prepare(queryString("delete_nicks"));
   deleteNickQuery.bindValue(":identityid", identity.id().toInt());
   safeExec(deleteNickQuery);
 
   QSqlQuery deleteNickQuery(logDb());
   deleteNickQuery.prepare(queryString("delete_nicks"));
   deleteNickQuery.bindValue(":identityid", identity.id().toInt());
   safeExec(deleteNickQuery);

+  watchQuery(deleteNickQuery);

 
   QSqlQuery insertNickQuery(logDb());
   insertNickQuery.prepare(queryString("insert_nick"));
 
   QSqlQuery insertNickQuery(logDb());
   insertNickQuery.prepare(queryString("insert_nick"));


@@ -295,6 +297,7 @@ bool SqliteStorage::updateIdentity(UserId user, const CoreIdentity &identity) {
     insertNickQuery.bindValue(":identityid", identity.id().toInt());
     insertNickQuery.bindValue(":nick", nick);
     safeExec(insertNickQuery);
     insertNickQuery.bindValue(":identityid", identity.id().toInt());
     insertNickQuery.bindValue(":nick", nick);
     safeExec(insertNickQuery);

+    watchQuery(insertNickQuery);

   }
 
   return true;
   }
 
   return true;