X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fpostgresqlstorage.h;h=83b24e228b153d7ee8ca5220d8f5daf6868986b3;hp=5729ac958056c696d3752057b7327c6c0e2ac0aa;hb=a72e2b4a90ce18c58b54e111161691ba008dc47d;hpb=7b4bac1b744a407d51f0ece67e0d531206ddad0b

diff --git a/src/core/postgresqlstorage.h b/src/core/postgresqlstorage.h
index 5729ac95..83b24e22 100644
--- a/src/core/postgresqlstorage.h
+++ b/src/core/postgresqlstorage.h
@@ -42,16 +42,16 @@ public slots:
   virtual QString description() const;
   virtual QStringList setupKeys() const;
   virtual QVariantMap setupDefaults() const;
-  virtual bool setup(const QVariantMap &settings = QVariantMap());
 
   // TODO: Add functions for configuring the backlog handling, i.e. defining auto-cleanup settings etc
 
   /* User handling */
 
   virtual UserId addUser(const QString &user, const QString &password);
-  virtual void updateUser(UserId user, const QString &password);
+  virtual bool updateUser(UserId user, const QString &password);
   virtual void renameUser(UserId user, const QString &newName);
   virtual UserId validateUser(const QString &user, const QString &password);
+  virtual UserId getUserId(const QString &username);
   virtual UserId internalUser();
   virtual void delUser(UserId user);
   virtual void setUserSetting(UserId userId, const QString &settingName, const QVariant &data);
@@ -92,6 +92,8 @@ public slots:
   virtual bool mergeBuffersPermanently(const UserId &user, const BufferId &bufferId1, const BufferId &bufferId2);
   virtual void setBufferLastSeenMsg(UserId user, const BufferId &bufferId, const MsgId &msgId);
   virtual QHash<BufferId, MsgId> bufferLastSeenMsgIds(UserId user);
+  virtual void setBufferMarkerLineMsg(UserId user, const BufferId &bufferId, const MsgId &msgId);
+  virtual QHash<BufferId, MsgId> bufferMarkerLineMsgIds(UserId user);
 
   /* Message handling */
   virtual bool logMessage(Message &msg);
@@ -100,6 +102,7 @@ public slots:
   virtual QList<Message> requestAllMsgs(UserId user, MsgId first = -1, MsgId last = -1, int limit = -1);
 
 protected:
+  virtual void initDbSession(QSqlDatabase &db);
   virtual void setConnectionProperties(const QVariantMap &properties);
   inline virtual QString driverName() { return "QPSQL"; }
   inline virtual QString hostName() { return _hostName; }
@@ -114,10 +117,9 @@ protected:
 
   bool beginReadOnlyTransaction(QSqlDatabase &db);
 
-  bool prepareQuery(const QString &handle, const QString &query, const QSqlDatabase &db);
-  QSqlQuery executePreparedQuery(const QString &handle, const QVariantList &params, const QSqlDatabase &db);
-  QSqlQuery executePreparedQuery(const QString &handle, const QVariant &param, const QSqlDatabase &db);
-  void deallocateQuery(const QString &handle, const QSqlDatabase &db);
+  QSqlQuery executePreparedQuery(const QString &queryname, const QVariantList &params, const QSqlDatabase &db);
+  QSqlQuery executePreparedQuery(const QString &queryname, const QVariant &param, const QSqlDatabase &db);
+  void deallocateQuery(const QString &queryname, const QSqlDatabase &db);
 
   inline void savePoint(const QString &handle, const QSqlDatabase &db) { db.exec(QString("SAVEPOINT %1").arg(handle)); }
   inline void rollbackSavePoint(const QString &handle, const QSqlDatabase &db) { db.exec(QString("ROLLBACK TO SAVEPOINT %1").arg(handle)); }
@@ -126,17 +128,14 @@ protected:
 private:
   void bindNetworkInfo(QSqlQuery &query, const NetworkInfo &info);
   void bindServerInfo(QSqlQuery &query, const Network::Server &server);
+  QSqlQuery prepareAndExecuteQuery(const QString &queryname, const QString &paramstring, const QSqlDatabase &db);
+  inline QSqlQuery prepareAndExecuteQuery(const QString &queryname, const QSqlDatabase &db) { return prepareAndExecuteQuery(queryname, QString(), db); }
 
   QString _hostName;
   int _port;
   QString _databaseName;
   QString _userName;
   QString _password;
-
-  typedef QHash<QString, QString> QueryHash;
-  QHash<QString, QueryHash> _preparedQueries; // one query hash per db connection
-  QMutex _queryHashMutex;
-
 };
 
 inline void PostgreSqlStorage::safeExec(QSqlQuery &query) { query.exec(); }