X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsqlitestorage.h;h=9aa70066d2aa87663f5fd5525a9ffa70cc5ad1a4;hp=3f213067a1b860e36e8b69a9dedc5f39c7093778;hb=29a45f620131394d4b80ad8c4a58b8acb359df76;hpb=698bd631332040f9a988ae8f31a80688893ca6f3

diff --git a/src/core/sqlitestorage.h b/src/core/sqlitestorage.h
index 3f213067..9aa70066 100644
--- a/src/core/sqlitestorage.h
+++ b/src/core/sqlitestorage.h
@@ -34,22 +34,25 @@ public:
   SqliteStorage(QObject *parent = 0);
   virtual ~SqliteStorage();
 
+  virtual AbstractSqlMigrationReader *createMigrationReader();
+
 public slots:
   /* General */
 
   bool isAvailable() const;
   QString displayName() const;
-  inline QVariantMap setupKeys() const { return QVariantMap(); }
+  virtual inline QStringList setupKeys() const { return QStringList(); }
+  virtual inline QVariantMap setupDefaults() const { return QVariantMap(); }
   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 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);
@@ -90,6 +93,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);
@@ -108,11 +113,13 @@ protected:
 
 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);
+  void bindNetworkInfo(QSqlQuery &query, const NetworkInfo &info);
+  void bindServerInfo(QSqlQuery &query, const Network::Server &server);
 
+  inline void lockForRead() { _dbLock.lockForRead(); }
+  inline void lockForWrite() { _dbLock.lockForWrite(); }
+  inline void unlock() { _dbLock.unlock(); }
+  QReadWriteLock _dbLock;
   static int _maxRetryCount;
 };
 
@@ -125,16 +132,6 @@ class SqliteMigrationReader : public SqliteStorage, public AbstractSqlMigrationR
 public:
   SqliteMigrationReader();
 
-//   virtual bool readUser(QuasselUserMO &user);
-//   virtual bool readSender(SenderMO &sender);
-//   virtual bool readIdentity(IdentityMO &identity);
-//   virtual bool readIdentityNick(IdentityNickMO &identityNick);
-//   virtual bool readNetwork(NetworkMO &network);
-//   virtual bool readBuffer(BufferMO &buffer);
-//   virtual bool readBacklog(BacklogMO &backlog);
-//   virtual bool readIrcServer(IrcServerMO &ircserver);
-//   virtual bool readUserSetting(UserSettingMO &userSetting);
-
   virtual bool readMo(QuasselUserMO &user);
   virtual bool readMo(SenderMO &sender);
   virtual bool readMo(IdentityMO &identity);
@@ -147,12 +144,20 @@ public:
 
   virtual bool prepareQuery(MigrationObject mo);
 
+  inline int stepSize() { return 50000; }
+
 protected:
   virtual inline bool transaction() { return logDb().transaction(); }
   virtual inline void rollback() { logDb().rollback(); }
   virtual inline bool commit() { return logDb().commit(); }
-};
 
+private:
+  void setMaxId(MigrationObject mo);
+  int _maxId;
+};
 
+inline AbstractSqlMigrationReader *SqliteStorage::createMigrationReader() {
+  return new SqliteMigrationReader();
+}
 
 #endif