This commit is contained in:
2024-10-09 09:51:09 -05:00
parent 9adec02640
commit 8541e292cd
3 changed files with 77 additions and 75 deletions

View File

@@ -32,7 +32,7 @@ namespace repertory {
class database_test : public ::testing::Test {
public:
static console_consumer cs;
db::db3_t db3;
utils::db::sqlite::db3_t db3;
void SetUp() override {
event_system::instance().start();
@@ -54,7 +54,7 @@ public:
};
static void common_insert(sqlite3 &db, bool dump = false) {
auto query = db::db_insert{db, "table"}
auto query = utils::db::sqlite::db_insert{db, "table"}
.column_value("column1", "test0")
.column_value("column2", "test1");
if (dump) {
@@ -67,7 +67,7 @@ static void common_insert(sqlite3 &db, bool dump = false) {
static void common_select(sqlite3 &db, std::string value1, std::string value2,
bool dump = false) {
auto query = db::db_select{db, "table"};
auto query = utils::db::sqlite::db_select{db, "table"};
if (dump) {
std::cout << query.dump() << std::endl;
}
@@ -78,7 +78,7 @@ static void common_select(sqlite3 &db, std::string value1, std::string value2,
std::size_t row_count{};
while (res.has_row()) {
std::optional<db::db_select::row> row;
std::optional<utils::db::sqlite::db_select::row> row;
EXPECT_TRUE(res.get_row(row));
EXPECT_TRUE(row.has_value());
if (row.has_value()) {
@@ -104,7 +104,7 @@ static void common_select(sqlite3 &db, std::string value1, std::string value2,
static void common_delete(sqlite3 &db, bool dump = false) {
{
auto query = db::db_delete{db, "table"};
auto query = utils::db::sqlite::db_delete{db, "table"};
if (dump) {
std::cout << query.dump() << std::endl;
}
@@ -114,7 +114,7 @@ static void common_delete(sqlite3 &db, bool dump = false) {
}
{
auto query = db::db_select{db, "table"};
auto query = utils::db::sqlite::db_select{db, "table"};
auto res = query.go();
EXPECT_TRUE(res.ok());
@@ -128,14 +128,14 @@ static void common_delete(sqlite3 &db, bool dump = false) {
}
TEST_F(database_test, db_delete_query) {
auto query = db::db_delete{*db3.get(), "table"};
auto query = utils::db::sqlite::db_delete{*db3.get(), "table"};
auto query_str = query.dump();
std::cout << query_str << std::endl;
EXPECT_STREQ(R"(DELETE FROM "table";)", query_str.c_str());
}
TEST_F(database_test, db_delete_where_query) {
auto query = db::db_delete{*db3.get(), "table"}
auto query = utils::db::sqlite::db_delete{*db3.get(), "table"}
.where("column1")
.equals("test1")
.and_()
@@ -148,7 +148,7 @@ TEST_F(database_test, db_delete_where_query) {
}
TEST_F(database_test, db_insert_query) {
auto query = db::db_insert{*db3.get(), "table"}
auto query = utils::db::sqlite::db_insert{*db3.get(), "table"}
.column_value("column1", "test9")
.column_value("column2", "test9");
auto query_str = query.dump();
@@ -158,7 +158,7 @@ TEST_F(database_test, db_insert_query) {
}
TEST_F(database_test, db_insert_or_replace_query) {
auto query = db::db_insert{*db3.get(), "table"}
auto query = utils::db::sqlite::db_insert{*db3.get(), "table"}
.or_replace()
.column_value("column1", "test1")
.column_value("column2", "test2");
@@ -170,14 +170,14 @@ TEST_F(database_test, db_insert_or_replace_query) {
}
TEST_F(database_test, db_select_query) {
auto query = db::db_select{*db3.get(), "table"};
auto query = utils::db::sqlite::db_select{*db3.get(), "table"};
auto query_str = query.dump();
std::cout << query_str << std::endl;
EXPECT_STREQ(R"(SELECT * FROM "table";)", query_str.c_str());
}
TEST_F(database_test, db_select_where_query) {
auto query = db::db_select{*db3.get(), "table"}
auto query = utils::db::sqlite::db_select{*db3.get(), "table"}
.where("column1")
.equals("test1")
.and_()
@@ -191,7 +191,7 @@ TEST_F(database_test, db_select_where_query) {
TEST_F(database_test, db_select_where_with_group_query) {
auto query =
db::db_select{*db3.get(), "table"}
utils::db::sqlite::db_select{*db3.get(), "table"}
.group([](auto &grp) {
grp.where("column1").equals("a").or_().where("column1").equals("b");
})
@@ -211,7 +211,7 @@ TEST_F(database_test, db_select_where_with_group_query) {
}
TEST_F(database_test, db_select_columns_query) {
auto query = db::db_select{*db3.get(), "table"}
auto query = utils::db::sqlite::db_select{*db3.get(), "table"}
.column("column1")
.column("column2")
.where("column1")
@@ -227,7 +227,7 @@ TEST_F(database_test, db_select_columns_query) {
}
TEST_F(database_test, db_update_query) {
auto query = db::db_update{*db3.get(), "table"}
auto query = utils::db::sqlite::db_update{*db3.get(), "table"}
.column_value("column1", "moose")
.where("column1")
.equals("test1")
@@ -253,7 +253,7 @@ TEST_F(database_test, insert_update_delete) {
common_insert(*db3.get());
{
auto query = db::db_update{*db3.get(), "table"}
auto query = utils::db::sqlite::db_update{*db3.get(), "table"}
.column_value("column1", "moose")
.where("column1")
.equals("test0");
@@ -271,7 +271,7 @@ TEST_F(database_test, insert_or_replace_and_delete) {
common_insert(*db3.get());
{
auto query = db::db_insert{*db3.get(), "table"}
auto query = utils::db::sqlite::db_insert{*db3.get(), "table"}
.or_replace()
.column_value("column1", "test0")
.column_value("column2", "moose");