X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.h;h=fbb366f68322b2ea8948f3a73dff45e81e681def;hp=45f1c4681988396fe22087f010158de718183dec;hb=7c9c1b348382b8b77f96a883945c522d32a478d5;hpb=4fef2ef49965b4e89a25e8cdc33100d9717d1aa8

diff --git a/src/core/sqlitestorage.h b/src/core/sqlitestorage.h
index 45f1c468..fbb366f6 100644
--- a/src/core/sqlitestorage.h
+++ b/src/core/sqlitestorage.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -36,15 +36,15 @@ public:
 
 public slots:
   /* General */
-  
+
   bool isAvailable() const;
   QString displayName() const;
   QString description() const;
 
   // 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 void renameUser(UserId user, const QString &newName);
@@ -54,7 +54,12 @@ public slots:
   virtual void setUserSetting(UserId userId, const QString &settingName, const QVariant &data);
   virtual QVariant getUserSetting(UserId userId, const QString &settingName, const QVariant &defaultData = QVariant());
 
-  
+  /* Identity handling */
+  virtual IdentityId createIdentity(UserId user, CoreIdentity &identity);
+  virtual bool updateIdentity(UserId user, const CoreIdentity &identity);
+  virtual void removeIdentity(UserId user, IdentityId identityId);
+  virtual QList<CoreIdentity> identities(UserId user);
+
   /* Network handling */
   virtual NetworkId createNetwork(UserId user, const NetworkInfo &info);
   virtual bool updateNetwork(UserId user, const NetworkInfo &info);
@@ -67,35 +72,46 @@ public slots:
   virtual QHash<QString, QString> persistentChannels(UserId user, const NetworkId &networkId);
   virtual void setChannelPersistent(UserId user, const NetworkId &networkId, const QString &channel, bool isJoined);
   virtual void setPersistentChannelKey(UserId user, const NetworkId &networkId, const QString &channel, const QString &key);
+
+  /* persistent user states */
+  virtual QString awayMessage(UserId user, NetworkId networkId);
+  virtual void setAwayMessage(UserId user, NetworkId networkId, const QString &awayMsg);
+  virtual QString userModes(UserId user, NetworkId networkId);
+  virtual void setUserModes(UserId user, NetworkId networkId, const QString &userModes);
   
   /* Buffer handling */
-  virtual BufferInfo getBufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer = "");
+  virtual BufferInfo bufferInfo(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer = "", bool create = true);
   virtual BufferInfo getBufferInfo(UserId user, const BufferId &bufferId);
   virtual QList<BufferInfo> requestBuffers(UserId user);
   virtual QList<BufferId> requestBufferIdsForNetwork(UserId user, NetworkId networkId);
   virtual bool removeBuffer(const UserId &user, const BufferId &bufferId);
-  virtual BufferId renameBuffer(const UserId &user, const NetworkId &networkId, const QString &newName, const QString &oldName);
+  virtual bool renameBuffer(const UserId &user, const BufferId &bufferId, const QString &newName);
+  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);
-  
+
   /* Message handling */
-  
+
   virtual MsgId logMessage(Message msg);
-  virtual QList<Message> requestMsgs(UserId user, BufferId bufferId, int lastmsgs = -1, int offset = -1);
-  virtual QList<Message> requestMsgs(UserId user, BufferId bufferId, QDateTime since, int offset = -1);
-  virtual QList<Message> requestMsgRange(UserId user, BufferId bufferId, int first, int last);
+  virtual QList<Message> requestMsgs(UserId user, BufferId bufferId, MsgId first = -1, MsgId last = -1, int limit = -1);
+  virtual QList<Message> requestAllMsgs(UserId user, MsgId first = -1, MsgId last = -1, int limit = -1);
 
 protected:
   inline virtual QString driverName() { return "QSQLITE"; }
   inline virtual QString databaseName() { return backlogFile(); }
   virtual int installedSchemaVersion();
-  
+  virtual bool updateSchemaVersion(int newVersion);
+  virtual bool setupSchemaVersion(int version);
+  bool safeExec(QSqlQuery &query, int retryCount = 0);
+
 private:
   static QString backlogFile();
   bool isValidNetwork(UserId user, const NetworkId &networkId);
   bool isValidBuffer(const UserId &user, const BufferId &bufferId);
   NetworkId getNetworkId(UserId user, const QString &network);
   void createBuffer(UserId user, const NetworkId &networkId, BufferInfo::Type type, const QString &buffer);
+
+  static int _maxRetryCount;
 };
 
 #endif