Switched to gtest for unit testing

This commit is contained in:
emeric
2021-05-03 13:20:43 +02:00
parent 444d4af3c6
commit 67ce7151ff
20 changed files with 2131 additions and 1905 deletions
+2 -2
View File
@@ -103,13 +103,13 @@ createQuery(Session& session,
for (std::string_view keyword : keywords)
{
clauses.push_back("a.name LIKE ? ESCAPE '" ESCAPE_CHAR_STR "'");
query.bind("%%" + escapeLikeKeyword(keyword) + "%%");
query.bind("%" + escapeLikeKeyword(keyword) + "%");
}
for (std::string_view keyword : keywords)
{
sortClauses.push_back("a.sort_name LIKE ? ESCAPE '" ESCAPE_CHAR_STR "'");
query.bind("%%" + escapeLikeKeyword(keyword) + "%%");
query.bind("%" + escapeLikeKeyword(keyword) + "%");
}
query.where("(" + StringUtils::joinStrings(clauses, " AND ") + ") OR (" + StringUtils::joinStrings(sortClauses, " AND ") + ")");
+1 -1
View File
@@ -46,7 +46,7 @@ createQuery(Session& session,
query.join("track t ON t.release_id = r.id");
for (std::string_view keyword : keywords)
query.where("r.name LIKE ? ESCAPE '" ESCAPE_CHAR_STR "'").bind("%%" + escapeLikeKeyword(keyword) + "%%");
query.where("r.name LIKE ? ESCAPE '" ESCAPE_CHAR_STR "'").bind("%" + escapeLikeKeyword(keyword) + "%");
if (!clusterIds.empty())
{
+1 -1
View File
@@ -48,7 +48,7 @@ createQuery(Session& session,
auto query {session.getDboSession().query<T>(queryStr)};
for (std::string_view keyword : keywords)
query.where("t.name LIKE ? ESCAPE '" ESCAPE_CHAR_STR "'").bind("%%" + escapeLikeKeyword(keyword) + "%%");
query.where("t.name LIKE ? ESCAPE '" ESCAPE_CHAR_STR "'").bind("%" + escapeLikeKeyword(keyword) + "%");
if (!clusterIds.empty())
{
+1 -1
View File
@@ -26,7 +26,7 @@ namespace Database
std::string
escapeLikeKeyword(std::string_view keyword)
{
return StringUtils::escapeString(keyword, "*_", escapeChar);
return StringUtils::escapeString(keyword, "%_", escapeChar);
}
} // namespace Database