BlockStorage/repertory
1
0
Fork 0
Code Issues 3 Pull Requests Releases 9 Wiki Activity

fix

Browse Source
This commit is contained in:
sgraves76
2024-10-08 13:23:19 -05:00
parent ec8b7783f3
commit 37d393c1f9
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
repertory/librepertory/include/database/db_common.hpp
View File

@@ -454,7 +454,7 @@ template <typename ctx_t, typename op_t> struct db_where_t final {
for (auto &&action : data.actions) { for (auto &&action : data.actions) {
std::visit(overloaded{ std::visit(overloaded{
[&idx, &stream](const comp_data_t &comp) { [&idx, &stream](const comp_data_t &comp) {
stream << comp.column_name << comp.op_type stream << '"' << comp.column_name << '"' << comp.op_type
<< '?' + std::to_string(++idx); << '?' + std::to_string(++idx);
}, },
[&idx, &stream](const n_t &next) { [&idx, &stream](const n_t &next) {
@@ -517,7 +517,7 @@ template <typename ctx_t, typename op_t> struct db_where_with_limit_t final {
for (auto &&action : data.actions) { for (auto &&action : data.actions) {
std::visit(overloaded{ std::visit(overloaded{
[&idx, &stream](const comp_data_t &comp) { [&idx, &stream](const comp_data_t &comp) {
stream << comp.column_name << comp.op_type stream << '"' << comp.column_name << '"' << comp.op_type
<< '?' + std::to_string(++idx); << '?' + std::to_string(++idx);
}, },
[&idx, &stream](const n_t &next) { [&idx, &stream](const n_t &next) {

9
repertory/repertory_test/src/database_test.cpp
View File

@@ -143,7 +143,7 @@ TEST_F(database_test, db_delete_where_query) {
.equals("test2"); .equals("test2");
auto query_str = query.dump(); auto query_str = query.dump();
std::cout << query_str << std::endl; std::cout << query_str << std::endl;
EXPECT_STREQ(R"(DELETE FROM "table" WHERE ("column1"=?1 AND "column2"=?2);)", EXPECT_STREQ(R"(DELETE FROM "table" WHERE "column1"=?1 AND "column2"=?2;)",
query_str.c_str()); query_str.c_str());
} }
@@ -185,8 +185,7 @@ TEST_F(database_test, db_select_where_query) {
.equals("test2"); .equals("test2");
auto query_str = query.dump(); auto query_str = query.dump();
std::cout << query_str << std::endl; std::cout << query_str << std::endl;
EXPECT_STREQ( EXPECT_STREQ(R"(SELECT * FROM "table" WHERE "column1"=?1 AND "column2"=?2;)",
R"(SELECT * FROM "table" WHERE ("column1"=?1 AND "column2"=?2);)",
query_str.c_str()); query_str.c_str());
} }
@@ -202,7 +201,7 @@ TEST_F(database_test, db_select_columns_query) {
auto query_str = query.dump(); auto query_str = query.dump();
std::cout << query_str << std::endl; std::cout << query_str << std::endl;
EXPECT_STREQ( EXPECT_STREQ(
R"(SELECT column1, column2 FROM "table" WHERE ("column1"=?1 AND "column2"=?2);)", R"(SELECT column1, column2 FROM "table" WHERE "column1"=?1 AND "column2"=?2;)",
query_str.c_str()); query_str.c_str());
} }
@@ -217,7 +216,7 @@ TEST_F(database_test, db_update_query) {
auto query_str = query.dump(); auto query_str = query.dump();
std::cout << query_str << std::endl; std::cout << query_str << std::endl;
EXPECT_STREQ( EXPECT_STREQ(
R"(UPDATE "table" SET "column1"=?1 WHERE ("column1"=?2 AND "column2"=?3);)", R"(UPDATE "table" SET "column1"=?1 WHERE "column1"=?2 AND "column2"=?3;)",
query_str.c_str()); query_str.c_str());
} }