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

fix travis build pipeline

Browse Source
This commit is contained in:
Eberhard Graether
2018-12-15 11:57:31 +01:00
parent ea931ceb9f
commit 16f130e5a8
4 changed files with 53 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/include/DatabaseStorage.h
+2
View File
@@ -81,8 +81,10 @@ namespace sourcetrail
DatabaseStorage() = default;
void setupTables();
void clearTables();
void setupIndices();
void setupPrecompiledStatements();
void clearPrecompiledStatements();
int insertElement();
void insertOrUpdateMetaValue(const std::string& key, const std::string& value);
core/src/DatabaseStorage.cpp
+49 -37
View File
@@ -52,25 +52,7 @@ namespace sourcetrail
DatabaseStorage::~DatabaseStorage()
{
m_insertElementStatement.finalize();
m_findNodeStatement.finalize();
m_insertNodeStatement.finalize();
m_setNodeTypeStmt.finalize();
m_insertSymbolStatement.finalize();
m_findFileStatement.finalize();
m_insertFileStatement.finalize();
m_setFileLanguageStmt.finalize();
m_insertFileContentStatement.finalize();
m_findEdgeStatement.finalize();
m_insertEdgeStatement.finalize();
m_findLocalSymbolStmt.finalize();
m_insertLocalSymbolStmt.finalize();
m_findSourceLocationStmt.finalize();
m_insertSourceLocationStmt.finalize();
m_insertOccurenceStmt.finalize();
m_findErrorStatement.finalize();
m_insertErrorStatement.finalize();
m_insertOrUpdateMetaValueStmt.finalize();
clearPrecompiledStatements();
m_database.close();
}
@@ -97,25 +79,9 @@ namespace sourcetrail
{
executeStatement("PRAGMA foreign_keys=OFF;");
const std::vector<std::string> tableNames = {
"meta",
"error",
"component_access",
"occurrence",
"source_location",
"local_symbol",
"filecontent",
"file",
"symbol",
"node",
"edge",
"element"
};
clearPrecompiledStatements();
for (const std::string& tableName : tableNames)
{
executeStatement("DROP TABLE IF EXISTS main." + tableName + ";");
}
clearTables();
setupDatabase();
}
@@ -533,6 +499,29 @@ namespace sourcetrail
);
}
void DatabaseStorage::clearTables()
{
const std::vector<std::string> tableNames = {
"meta",
"error",
"component_access",
"occurrence",
"source_location",
"local_symbol",
"filecontent",
"file",
"symbol",
"node",
"edge",
"element"
};
for (const std::string& tableName : tableNames)
{
executeStatement("DROP TABLE IF EXISTS main." + tableName + ";");
}
}
void DatabaseStorage::setupIndices()
{
executeStatement(
@@ -651,6 +640,29 @@ namespace sourcetrail
);
}
void DatabaseStorage::clearPrecompiledStatements()
{
m_insertElementStatement.finalize();
m_findNodeStatement.finalize();
m_insertNodeStatement.finalize();
m_setNodeTypeStmt.finalize();
m_insertSymbolStatement.finalize();
m_findFileStatement.finalize();
m_insertFileStatement.finalize();
m_setFileLanguageStmt.finalize();
m_insertFileContentStatement.finalize();
m_findEdgeStatement.finalize();
m_insertEdgeStatement.finalize();
m_findLocalSymbolStmt.finalize();
m_insertLocalSymbolStmt.finalize();
m_findSourceLocationStmt.finalize();
m_insertSourceLocationStmt.finalize();
m_insertOccurenceStmt.finalize();
m_findErrorStatement.finalize();
m_insertErrorStatement.finalize();
m_insertOrUpdateMetaValueStmt.finalize();
}
int DatabaseStorage::insertElement()
{
executeStatement(m_insertElementStatement);
examples/cpp_api_example/CMakeLists.txt
+1 -1
View File
@@ -17,7 +17,7 @@ target_include_directories(${EXAMPLE_NAME} PUBLIC
"${CORE_SOURCE_DIR}/include"
)
target_link_libraries(${EXAMPLE_NAME} ${LIB_CORE})
target_link_libraries(${EXAMPLE_NAME} ${LIB_CORE} "-ldl")
# --- Configure Sourcetrail Project File ---
examples/cpp_poetry_indexer/CMakeLists.txt
+1 -1
View File
@@ -17,7 +17,7 @@ target_include_directories(${EXAMPLE_NAME} PUBLIC
"${CORE_SOURCE_DIR}/include"
)
target_link_libraries(${EXAMPLE_NAME} ${LIB_CORE})
target_link_libraries(${EXAMPLE_NAME} ${LIB_CORE} "-ldl")
# --- Configure Sourcetrail Project File ---