X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.cpp;h=613fa32df2c8a6deca9920af1feda166e99aff7d;hp=eb6b3d884f35d8840d11873c548362e60fff6f49;hb=4fef2ef49965b4e89a25e8cdc33100d9717d1aa8;hpb=cfa01e5ffc7988e7976b8dc0777dabf26b0eacc5

diff --git a/src/core/sqlitestorage.cpp b/src/core/sqlitestorage.cpp
index eb6b3d88..613fa32d 100644
--- a/src/core/sqlitestorage.cpp
+++ b/src/core/sqlitestorage.cpp
@@ -798,51 +798,3 @@ QList<Message> SqliteStorage::requestMsgRange(UserId user, BufferId bufferId, in
 QString SqliteStorage::backlogFile() {
   return quasselDir().absolutePath() + "/quassel-storage.sqlite";  
 }
-
-
-// ONLY NEEDED FOR MIGRATION
-bool SqliteStorage::init(const QVariantMap &settings) {
-  if(!AbstractSqlStorage::init(settings))
-    return false;
-
-  QSqlQuery checkMigratedQuery(logDb());
-  checkMigratedQuery.prepare("SELECT DISTINCT typeOf(password) FROM quasseluser");
-  checkMigratedQuery.exec();
-  if(!watchQuery(checkMigratedQuery))
-    return false;
-
-  if(!checkMigratedQuery.first())
-    return true;		// table is empty -> no work to be done
-
-  QString passType = checkMigratedQuery.value(0).toString().toLower();
-  if(passType == "text")
-    return true; // allready migrated
-
-  Q_ASSERT(passType == "blob");
-  
-  QSqlQuery getPasswordsQuery(logDb());
-  getPasswordsQuery.prepare("SELECT userid, password FROM quasseluser");
-  getPasswordsQuery.exec();
-
-  if(!watchQuery(getPasswordsQuery)) {
-    qCritical() << "unable to migrate to new password format!";
-    return false;
-  }
-
-  QHash<int, QByteArray> passHash;
-  while(getPasswordsQuery.next()) {
-    passHash[getPasswordsQuery.value(0).toInt()] = getPasswordsQuery.value(1).toByteArray();
-  }
-
-  QSqlQuery setPasswordsQuery(logDb());
-  setPasswordsQuery.prepare("UPDATE quasseluser SET password = :password WHERE userid = :userid");
-  foreach(int userId, passHash.keys()) {
-    setPasswordsQuery.bindValue(":password", QString(passHash[userId]));
-    setPasswordsQuery.bindValue(":userid", userId);
-    setPasswordsQuery.exec();
-    watchQuery(setPasswordsQuery);
-  }
-
-  qDebug() << "successfully migrated passwords!";
-  return true;
-}