data: bookmark refactoring

* implemented handling of aggregations in bookmarks * split index Storage and bookmark storage * each sqlite database has its own version now * added bookmark tests * fixed creating bookmark tables when project can be loaded but bookmark db does not exist * fixed font size for bookmarkview tooltips * using bookmark cache now * using default category name when none specified by the user * raising bookmark windows when they should be shown * clearing a bookmark or category in the editor will now update the star icon accordingly * non-persistent bookmarks use ids of nodes and edges now (instead of names) * git ignore .srctrlbm files
2017-04-17 10:55:59 +02:00
parent 6cd6552343
commit 2b24b88745
48 changed files with 2856 additions and 2981 deletions
@@ -0,0 +1,72 @@
+#ifndef SQLITE_BOOKMARK_STORAGE_H
+#define SQLITE_BOOKMARK_STORAGE_H
+
+#include "sqlite/CppSQLite3.h"
+
+#include "data/bookmark/BookmarkCategory.h"
+#include "data/bookmark/EdgeBookmark.h"
+#include "data/bookmark/NodeBookmark.h"
+#include "data/SqliteStorage.h"
+#include "data/StorageTypes.h"
+#include "utility/file/FilePath.h"
+#include "utility/types.h"
+
+class SqliteBookmarkStorage
+	: public SqliteStorage
+{
+public:
+	SqliteBookmarkStorage(const FilePath& dbFilePath);
+	virtual ~SqliteBookmarkStorage();
+
+	Id addBookmarkCategory(const std::string& name);
+	Id addBookmark(const std::string& name, const std::string& comment, const std::string& timestamp, const Id categoryId);
+	Id addBookmarkedNode(const Id bookmarkId, const std::string& nodeName);
+	Id addBookmarkedEdge(const Id bookmarkId, const std::string& sourceNodeName, const std::string& targetNodeName, const int edgeType, const bool sourceNodeActive);
+
+	void removeBookmarkCategory(Id id);
+	void removeBookmark(const Id id);
+
+	std::vector<StorageBookmark> getAllBookmarks() const;
+	std::vector<StorageBookmarkedNode> getAllBookmarkedNodes() const;
+	std::vector<StorageBookmarkedEdge> getAllBookmarkedEdges() const;
+
+	void updateBookmark(const Id bookmarkId, const std::string& name, const std::string& comment, const Id categoryId);
+
+	std::vector<StorageBookmarkCategory> getAllBookmarkCategories() const;
+	StorageBookmarkCategory getBookmarkCategoryByName(const std::string& name) const;
+
+private:
+	static const size_t s_storageVersion;
+
+	virtual size_t getStaticStorageVersion() const;
+	virtual std::vector<std::pair<int, SqliteDatabaseIndex>> getIndices() const;
+	virtual void clearTables();
+	virtual void setupTables();
+
+	//void updateBookmarkMetaData(const BookmarkMetaData& metaData);
+
+	template <typename ResultType>
+	std::vector<ResultType> doGetAll(const std::string& query) const;
+
+	template <typename ResultType>
+	ResultType doGetFirst(const std::string& query) const
+	{
+		std::vector<ResultType> results = doGetAll<ResultType>(query + " LIMIT 1");
+		if (results.size() > 0)
+		{
+			return results[0];
+		}
+		return ResultType();
+	}
+};
+
+template <>
+std::vector<StorageBookmarkCategory> SqliteBookmarkStorage::doGetAll<StorageBookmarkCategory>(const std::string& query) const;
+template <>
+std::vector<StorageBookmark> SqliteBookmarkStorage::doGetAll<StorageBookmark>(const std::string& query) const;
+template <>
+std::vector<StorageBookmarkedNode> SqliteBookmarkStorage::doGetAll<StorageBookmarkedNode>(const std::string& query) const;
+template <>
+std::vector<StorageBookmarkedEdge> SqliteBookmarkStorage::doGetAll<StorageBookmarkedEdge>(const std::string& query) const;
+
+#endif // SQLITE_BOOKMARK_STORAGE_H