feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Fix statement names for symbol storage

Browse Source 
Change-Id: Ieb242baf70ffedbdcfdbdbff2b780a1ffb810cc2
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Marco Bubke
2018-01-24 19:06:58 +01:00
parent b247c4fdeb
commit 8beb205ee0
4 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tools/clangrefactoringbackend/source/storagesqlitestatementfactory.h
View File

@@ -142,27 +142,27 @@ public:
"DELETE FROM newLocations", "DELETE FROM newLocations",
database database
}; };
WriteStatement insertProjectPart{ WriteStatement insertProjectPartStatement{
"INSERT OR IGNORE INTO projectParts(projectPartName, compilerArguments) VALUES (?,?)", "INSERT OR IGNORE INTO projectParts(projectPartName, compilerArguments) VALUES (?,?)",
database database
}; };
WriteStatement updateProjectPart{ WriteStatement updateProjectPartStatement{
"UPDATE projectParts SET compilerArguments = ? WHERE projectPartName = ?", "UPDATE projectParts SET compilerArguments = ? WHERE projectPartName = ?",
database database
}; };
ReadStatement getProjectPartId{ ReadStatement getProjectPartIdStatement{
"SELECT projectPartId FROM projectParts WHERE projectPartName = ?", "SELECT projectPartId FROM projectParts WHERE projectPartName = ?",
database database
}; };
WriteStatement deleteAllProjectPartsSourcesWithProjectPartId{ WriteStatement deleteAllProjectPartsSourcesWithProjectPartIdStatement{
"DELETE FROM projectPartsSources WHERE projectPartId = ?", "DELETE FROM projectPartsSources WHERE projectPartId = ?",
database database
}; };
WriteStatement insertProjectPartSources{ WriteStatement insertProjectPartSourcesStatement{
"INSERT INTO projectPartsSources(projectPartId, sourceId) VALUES (?,?)", "INSERT INTO projectPartsSources(projectPartId, sourceId) VALUES (?,?)",
database database
}; };
ReadStatement getCompileArgumentsForFileId{ ReadStatement getCompileArgumentsForFileIdStatement{
"SELECT compilerArguments FROM projectParts WHERE projectPartId = (SELECT projectPartId FROM projectPartsSources WHERE sourceId = ?)", "SELECT compilerArguments FROM projectParts WHERE projectPartId = (SELECT projectPartId FROM projectPartsSources WHERE sourceId = ?)",
database database
}; };

10
src/tools/clangrefactoringbackend/source/symbolstorage.h
View File

@@ -72,11 +72,11 @@ public:
Utils::SmallString compilerArguementsAsJson = toJson(commandLineArguments); Utils::SmallString compilerArguementsAsJson = toJson(commandLineArguments);
WriteStatement &insertStatement = m_statementFactory.insertProjectPart; WriteStatement &insertStatement = m_statementFactory.insertProjectPartStatement;
insertStatement.write(projectPartName, compilerArguementsAsJson); insertStatement.write(projectPartName, compilerArguementsAsJson);
if (m_statementFactory.database.lastInsertedRowId() == -1) { if (m_statementFactory.database.lastInsertedRowId() == -1) {
WriteStatement &updateStatement = m_statementFactory.updateProjectPart; WriteStatement &updateStatement = m_statementFactory.updateProjectPartStatement;
updateStatement.write(compilerArguementsAsJson, projectPartName); updateStatement.write(compilerArguementsAsJson, projectPartName);
} }
} }
@@ -95,13 +95,13 @@ public:
void updateProjectPartSources(Utils::SmallStringView projectPartName, void updateProjectPartSources(Utils::SmallStringView projectPartName,
const FilePathIds &sourceFilePathIds) override const FilePathIds &sourceFilePathIds) override
{ {
ReadStatement &getProjectPartIdStatement = m_statementFactory.getProjectPartId; ReadStatement &getProjectPartIdStatement = m_statementFactory.getProjectPartIdStatement;
int projectPartId = getProjectPartIdStatement.template value<int>(projectPartName).value(); int projectPartId = getProjectPartIdStatement.template value<int>(projectPartName).value();
WriteStatement &deleteStatement = m_statementFactory.deleteAllProjectPartsSourcesWithProjectPartId; WriteStatement &deleteStatement = m_statementFactory.deleteAllProjectPartsSourcesWithProjectPartIdStatement;
deleteStatement.write(projectPartId); deleteStatement.write(projectPartId);
WriteStatement &insertStatement = m_statementFactory.insertProjectPartSources; WriteStatement &insertStatement = m_statementFactory.insertProjectPartSourcesStatement;
for (const FilePathId &sourceFilePathId : sourceFilePathIds) for (const FilePathId &sourceFilePathId : sourceFilePathIds)
insertStatement.write(projectPartId, sourceFilePathId.filePathId); insertStatement.write(projectPartId, sourceFilePathId.filePathId);
} }

12
tests/unit/unittest/storagesqlitestatementfactory-test.cpp
View File

@@ -156,37 +156,37 @@ TEST_F(StorageSqliteStatementFactory, DeleteNewLocationsTableStatement)
TEST_F(StorageSqliteStatementFactory, InsertProjectPart) TEST_F(StorageSqliteStatementFactory, InsertProjectPart)
{ {
ASSERT_THAT(factory.insertProjectPart.sqlStatement, ASSERT_THAT(factory.insertProjectPartStatement.sqlStatement,
Eq("INSERT OR IGNORE INTO projectParts(projectPartName, compilerArguments) VALUES (?,?)")); Eq("INSERT OR IGNORE INTO projectParts(projectPartName, compilerArguments) VALUES (?,?)"));
} }
TEST_F(StorageSqliteStatementFactory, UpdateProjectPart) TEST_F(StorageSqliteStatementFactory, UpdateProjectPart)
{ {
ASSERT_THAT(factory.updateProjectPart.sqlStatement, ASSERT_THAT(factory.updateProjectPartStatement.sqlStatement,
Eq("UPDATE projectParts SET compilerArguments = ? WHERE projectPartName = ?")); Eq("UPDATE projectParts SET compilerArguments = ? WHERE projectPartName = ?"));
} }
TEST_F(StorageSqliteStatementFactory, GetProjectPartIdForProjectPartName) TEST_F(StorageSqliteStatementFactory, GetProjectPartIdForProjectPartName)
{ {
ASSERT_THAT(factory.getProjectPartId.sqlStatement, ASSERT_THAT(factory.getProjectPartIdStatement.sqlStatement,
Eq("SELECT projectPartId FROM projectParts WHERE projectPartName = ?")); Eq("SELECT projectPartId FROM projectParts WHERE projectPartName = ?"));
} }
TEST_F(StorageSqliteStatementFactory, DeleteAllProjectPartsSourcesWithProjectPartId) TEST_F(StorageSqliteStatementFactory, DeleteAllProjectPartsSourcesWithProjectPartId)
{ {
ASSERT_THAT(factory.deleteAllProjectPartsSourcesWithProjectPartId.sqlStatement, ASSERT_THAT(factory.deleteAllProjectPartsSourcesWithProjectPartIdStatement.sqlStatement,
Eq("DELETE FROM projectPartsSources WHERE projectPartId = ?")); Eq("DELETE FROM projectPartsSources WHERE projectPartId = ?"));
} }
TEST_F(StorageSqliteStatementFactory, InsertProjectPartsSources) TEST_F(StorageSqliteStatementFactory, InsertProjectPartsSources)
{ {
ASSERT_THAT(factory.insertProjectPartSources.sqlStatement, ASSERT_THAT(factory.insertProjectPartSourcesStatement.sqlStatement,
Eq("INSERT INTO projectPartsSources(projectPartId, sourceId) VALUES (?,?)")); Eq("INSERT INTO projectPartsSources(projectPartId, sourceId) VALUES (?,?)"));
} }
TEST_F(StorageSqliteStatementFactory, GetCompileArgumentsForFileId) TEST_F(StorageSqliteStatementFactory, GetCompileArgumentsForFileId)
{ {
ASSERT_THAT(factory.getCompileArgumentsForFileId.sqlStatement, ASSERT_THAT(factory.getCompileArgumentsForFileIdStatement.sqlStatement,
Eq("SELECT compilerArguments FROM projectParts WHERE projectPartId = (SELECT projectPartId FROM projectPartsSources WHERE sourceId = ?)")); Eq("SELECT compilerArguments FROM projectParts WHERE projectPartId = (SELECT projectPartId FROM projectPartsSources WHERE sourceId = ?)"));
} }

24
tests/unit/unittest/symbolstorage-test.cpp
View File

@@ -69,11 +69,11 @@ protected:
MockSqliteWriteStatement &insertNewLocationsInLocationsStatement = statementFactory.insertNewLocationsInLocationsStatement; MockSqliteWriteStatement &insertNewLocationsInLocationsStatement = statementFactory.insertNewLocationsInLocationsStatement;
MockSqliteWriteStatement &deleteNewSymbolsTableStatement = statementFactory.deleteNewSymbolsTableStatement; MockSqliteWriteStatement &deleteNewSymbolsTableStatement = statementFactory.deleteNewSymbolsTableStatement;
MockSqliteWriteStatement &deleteNewLocationsTableStatement = statementFactory.deleteNewLocationsTableStatement; MockSqliteWriteStatement &deleteNewLocationsTableStatement = statementFactory.deleteNewLocationsTableStatement;
MockSqliteWriteStatement &insertProjectPart = statementFactory.insertProjectPart; MockSqliteWriteStatement &insertProjectPartStatement = statementFactory.insertProjectPartStatement;
MockSqliteWriteStatement &updateProjectPart = statementFactory.updateProjectPart; MockSqliteWriteStatement &updateProjectPartStatement = statementFactory.updateProjectPartStatement;
MockSqliteReadStatement &getProjectPartId = statementFactory.getProjectPartId; MockSqliteReadStatement &getProjectPartIdStatement = statementFactory.getProjectPartIdStatement;
MockSqliteWriteStatement &deleteAllProjectPartsSourcesWithProjectPartId = statementFactory.deleteAllProjectPartsSourcesWithProjectPartId; MockSqliteWriteStatement &deleteAllProjectPartsSourcesWithProjectPartIdStatement = statementFactory.deleteAllProjectPartsSourcesWithProjectPartIdStatement;
MockSqliteWriteStatement &insertProjectPartSources = statementFactory.insertProjectPartSources; MockSqliteWriteStatement &insertProjectPartSourcesStatement = statementFactory.insertProjectPartSourcesStatement;
MockSqliteWriteStatement &insertIntoNewUsedDefinesStatement = statementFactory.insertIntoNewUsedDefinesStatement; MockSqliteWriteStatement &insertIntoNewUsedDefinesStatement = statementFactory.insertIntoNewUsedDefinesStatement;
MockSqliteWriteStatement &syncNewUsedDefinesStatement = statementFactory.syncNewUsedDefinesStatement; MockSqliteWriteStatement &syncNewUsedDefinesStatement = statementFactory.syncNewUsedDefinesStatement;
MockSqliteWriteStatement &deleteOutdatedUsedDefinesStatement = statementFactory.deleteOutdatedUsedDefinesStatement; MockSqliteWriteStatement &deleteOutdatedUsedDefinesStatement = statementFactory.deleteOutdatedUsedDefinesStatement;
@@ -177,7 +177,7 @@ TEST_F(SymbolStorage, InsertProjectPart)
ON_CALL(mockDatabase, lastInsertedRowId()).WillByDefault(Return(1)); ON_CALL(mockDatabase, lastInsertedRowId()).WillByDefault(Return(1));
EXPECT_CALL(mockDatabase, setLastInsertedRowId(-1)); EXPECT_CALL(mockDatabase, setLastInsertedRowId(-1));
EXPECT_CALL(insertProjectPart, write(TypedEq<Utils::SmallStringView>("project"), TypedEq<Utils::SmallStringView>("[\"foo\"]"))); EXPECT_CALL(insertProjectPartStatement, write(TypedEq<Utils::SmallStringView>("project"), TypedEq<Utils::SmallStringView>("[\"foo\"]")));
EXPECT_CALL(mockDatabase, lastInsertedRowId()); EXPECT_CALL(mockDatabase, lastInsertedRowId());
storage.insertOrUpdateProjectPart("project", {"foo"}); storage.insertOrUpdateProjectPart("project", {"foo"});
@@ -189,9 +189,9 @@ TEST_F(SymbolStorage, UpdateProjectPart)
ON_CALL(mockDatabase, lastInsertedRowId()).WillByDefault(Return(-1)); ON_CALL(mockDatabase, lastInsertedRowId()).WillByDefault(Return(-1));
EXPECT_CALL(mockDatabase, setLastInsertedRowId(-1)); EXPECT_CALL(mockDatabase, setLastInsertedRowId(-1));
EXPECT_CALL(insertProjectPart, write(TypedEq<Utils::SmallStringView>("project"), TypedEq<Utils::SmallStringView>("[\"foo\"]"))); EXPECT_CALL(insertProjectPartStatement, write(TypedEq<Utils::SmallStringView>("project"), TypedEq<Utils::SmallStringView>("[\"foo\"]")));
EXPECT_CALL(mockDatabase, lastInsertedRowId()); EXPECT_CALL(mockDatabase, lastInsertedRowId());
EXPECT_CALL(updateProjectPart, write(TypedEq<Utils::SmallStringView>("[\"foo\"]"), TypedEq<Utils::SmallStringView>("project"))); EXPECT_CALL(updateProjectPartStatement, write(TypedEq<Utils::SmallStringView>("[\"foo\"]"), TypedEq<Utils::SmallStringView>("project")));
storage.insertOrUpdateProjectPart("project", {"foo"}); storage.insertOrUpdateProjectPart("project", {"foo"});
} }
@@ -200,10 +200,10 @@ TEST_F(SymbolStorage, UpdateProjectPartSources)
{ {
InSequence sequence; InSequence sequence;
EXPECT_CALL(getProjectPartId, valueReturnInt32(TypedEq<Utils::SmallStringView>("project"))).WillRepeatedly(Return(42)); EXPECT_CALL(getProjectPartIdStatement, valueReturnInt32(TypedEq<Utils::SmallStringView>("project"))).WillRepeatedly(Return(42));
EXPECT_CALL(deleteAllProjectPartsSourcesWithProjectPartId, write(TypedEq<int>(42))); EXPECT_CALL(deleteAllProjectPartsSourcesWithProjectPartIdStatement, write(TypedEq<int>(42)));
EXPECT_CALL(insertProjectPartSources, write(TypedEq<int>(42), TypedEq<int>(1))); EXPECT_CALL(insertProjectPartSourcesStatement, write(TypedEq<int>(42), TypedEq<int>(1)));
EXPECT_CALL(insertProjectPartSources, write(TypedEq<int>(42), TypedEq<int>(2))); EXPECT_CALL(insertProjectPartSourcesStatement, write(TypedEq<int>(42), TypedEq<int>(2)));
storage.updateProjectPartSources("project", {{1, 1}, {1, 2}}); storage.updateProjectPartSources("project", {{1, 1}, {1, 2}});
} }