ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "src: Disabled bookmarking for upcoming release"

Browse Source 
This reverts commit 356c753f13.
This commit is contained in:
Eberhard Graether
2017-02-19 20:48:17 +01:00
parent ed9ff6d1bc
commit 558f0451af
2 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/component/ComponentManager.cpp
+2 -2
View File
@@ -33,8 +33,8 @@ void ComponentManager::setup(ViewLayout* viewLayout)
m_componentFactory->getViewFactory()->createCompositeView(viewLayout, CompositeView::DIRECTION_HORIZONTAL, "Search");
m_compositeViews.push_back(compositeView);
// std::shared_ptr<Component> bookmarkComponent = m_componentFactory->createBookmarkComponent(compositeView.get());
// m_components.push_back(bookmarkComponent);
std::shared_ptr<Component> bookmarkComponent = m_componentFactory->createBookmarkComponent(compositeView.get());
m_components.push_back(bookmarkComponent);
std::shared_ptr<Component> undoRedoComponent = m_componentFactory->createUndoRedoComponent(compositeView.get());
m_components.push_back(undoRedoComponent);
src/lib/data/SqliteStorage.cpp
+60 -60
View File
@@ -1361,72 +1361,72 @@ void SqliteStorage::setupTables()
"PRIMARY KEY(id));"
);
// m_database.execDML(
// "CREATE TABLE IF NOT EXISTS bookmarkCategory("
// "id INTEGER NOT NULL, "
// "name TEXT, "
// "PRIMARY KEY(id));"
// );
m_database.execDML(
"CREATE TABLE IF NOT EXISTS bookmarkCategory("
"id INTEGER NOT NULL, "
"name TEXT, "
"PRIMARY KEY(id));"
);
// m_database.execDML(
// "CREATE TABLE IF NOT EXISTS nodeBookmark("
// "id INTEGER NOT NULL, "
// "name TEXT, "
// "comment TEXT, "
// "timestamp TEXT, "
// "category INTEGER, "
// "PRIMARY KEY(id), "
// "FOREIGN KEY(category) REFERENCES bookmarkCategory(id));"
// );
m_database.execDML(
"CREATE TABLE IF NOT EXISTS nodeBookmark("
"id INTEGER NOT NULL, "
"name TEXT, "
"comment TEXT, "
"timestamp TEXT, "
"category INTEGER, "
"PRIMARY KEY(id), "
"FOREIGN KEY(category) REFERENCES bookmarkCategory(id));"
);
// m_database.execDML(
// "CREATE TABLE IF NOT EXISTS edgeBookmark("
// "id INTEGER NOT NULL, "
// "name TEXT, "
// "comment TEXT, "
// "timestamp TEXT, "
// "category INTEGER, "
// "PRIMARY KEY(id), "
// "FOREIGN KEY(category) REFERENCES bookmarkCategory(id));"
// );
m_database.execDML(
"CREATE TABLE IF NOT EXISTS edgeBookmark("
"id INTEGER NOT NULL, "
"name TEXT, "
"comment TEXT, "
"timestamp TEXT, "
"category INTEGER, "
"PRIMARY KEY(id), "
"FOREIGN KEY(category) REFERENCES bookmarkCategory(id));"
);
// m_database.execDML(
// "CREATE TABLE IF NOT EXISTS nodeBookmarkToken("
// "id INTEGER NOT NULL, "
// "bookmarkId INTEGER NOT NULL, "
// "name TEXT, "
// "type INTEGER, "
// "PRIMARY KEY(id), "
// "FOREIGN KEY(bookmarkId) REFERENCES nodeBookmark(id) ON DELETE CASCADE);"
// );
m_database.execDML(
"CREATE TABLE IF NOT EXISTS nodeBookmarkToken("
"id INTEGER NOT NULL, "
"bookmarkId INTEGER NOT NULL, "
"name TEXT, "
"type INTEGER, "
"PRIMARY KEY(id), "
"FOREIGN KEY(bookmarkId) REFERENCES nodeBookmark(id) ON DELETE CASCADE);"
);
// m_database.execDML(
// "CREATE TABLE IF NOT EXISTS edgeBookmarkToken("
// "id INTEGER NOT NULL, "
// "bookmarkId INTEGER NOT NULL, "
// "name TEXT, "
// "type INTEGER, "
// "PRIMARY KEY(id), "
// "FOREIGN KEY(bookmarkId) REFERENCES edgeBookmark(id) ON DELETE CASCADE);"
// );
m_database.execDML(
"CREATE TABLE IF NOT EXISTS edgeBookmarkToken("
"id INTEGER NOT NULL, "
"bookmarkId INTEGER NOT NULL, "
"name TEXT, "
"type INTEGER, "
"PRIMARY KEY(id), "
"FOREIGN KEY(bookmarkId) REFERENCES edgeBookmark(id) ON DELETE CASCADE);"
);
// m_database.execDML(
// "CREATE TABLE IF NOT EXISTS edgeBaseBookmark("
// "id INTEGER NOT NULL, "
// "edgeId INTEGER, "
// "PRIMARY KEY(id), "
// "FOREIGN KEY(edgeId) REFERENCES edgeBookmark(id) ON DELETE CASCADE);"
// );
m_database.execDML(
"CREATE TABLE IF NOT EXISTS edgeBaseBookmark("
"id INTEGER NOT NULL, "
"edgeId INTEGER, "
"PRIMARY KEY(id), "
"FOREIGN KEY(edgeId) REFERENCES edgeBookmark(id) ON DELETE CASCADE);"
);
// m_database.execDML(
// "CREATE TABLE IF NOT EXISTS edgeBaseBookmarkToken("
// "id INTEGER NOT NULL, "
// "bookmarkId INTEGER NOT NULL, "
// "name TEXT, "
// "type INTEGER, "
// "PRIMARY KEY(id), "
// "FOREIGN KEY(bookmarkId) REFERENCES edgeBaseBookmark(id) ON DELETE CASCADE);"
// );
m_database.execDML(
"CREATE TABLE IF NOT EXISTS edgeBaseBookmarkToken("
"id INTEGER NOT NULL, "
"bookmarkId INTEGER NOT NULL, "
"name TEXT, "
"type INTEGER, "
"PRIMARY KEY(id), "
"FOREIGN KEY(bookmarkId) REFERENCES edgeBaseBookmark(id) ON DELETE CASCADE);"
);
}
catch (CppSQLite3Exception& e)
{