sascha/query
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

removed class query and moved their static methods to simple functions

Browse Source
This commit is contained in:
sascha
2026-03-26 09:34:32 +01:00
parent 3fc08fb7ff
commit fedce38270
23 changed files with 283 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/backends/QueryBasicTest.cpp
+34 -34
View File
@@ -68,14 +68,14 @@ TEST_CASE_METHOD(QueryFixture, "Insert and select basic datatypes", "[query][dat
blob_val
};
auto res = query::insert()
auto res = insert()
.into("types", generator::columns<types>(repo))
.values(t)
.execute(db);
REQUIRE(res.is_ok());
REQUIRE(res->affected_rows == 1);
auto result = query::select<types>(repo)
auto result = select<types>(repo)
.from("types")
.fetch_one<types>(db);
REQUIRE(result.is_ok());
@@ -102,7 +102,7 @@ TEST_CASE_METHOD(QueryFixture, "Insert and select basic datatypes", "[query][dat
}
TEST_CASE_METHOD( QueryFixture, "Test quoted identifier", "[query][quotes][identifier]" ) {
auto res = query::create()
auto res = create()
.table("quotes")
.columns({
attribute("from", basic_type::Varchar, 255),
@@ -126,14 +126,14 @@ TEST_CASE_METHOD( QueryFixture, "Test quoted identifier", "[query][quotes][ident
++i;
}
res = query::insert()
res = insert()
.into("quotes", {"from", "to"})
.values({"Berlin", "London"})
.execute(db);
REQUIRE(res.is_ok());
REQUIRE(res->affected_rows == 1);
auto row = query::select({"from", "to"})
auto row = select({"from", "to"})
.from("quotes")
.fetch_one(db);
REQUIRE(row.is_ok());
@@ -142,7 +142,7 @@ TEST_CASE_METHOD( QueryFixture, "Test quoted identifier", "[query][quotes][ident
REQUIRE(row.value()->at("from").as<std::string>() == "Berlin");
REQUIRE(row.value()->at("to").as<std::string>() == "London");
res = query::update("quotes")
res = update("quotes")
.set("from", "Hamburg")
.set("to", "New York")
.where("from"_col == "Berlin")
@@ -150,7 +150,7 @@ TEST_CASE_METHOD( QueryFixture, "Test quoted identifier", "[query][quotes][ident
REQUIRE(res.is_ok());
REQUIRE(res->affected_rows == 1);
row = query::select({"from", "to"})
row = select({"from", "to"})
.from("quotes")
.fetch_one(db);
REQUIRE(row.is_ok());
@@ -176,7 +176,7 @@ TEST_CASE_METHOD( QueryFixture, "Test quoted column names", "[query][quotes][col
tables_to_drop.emplace("quotes");
for (const auto &name : column_names) {
auto res = query::create()
auto res = create()
.table("quotes")
.columns({
attribute(name, basic_type::Varchar, 255)
@@ -193,7 +193,7 @@ TEST_CASE_METHOD( QueryFixture, "Test quoted column names", "[query][quotes][col
REQUIRE(col.type() == basic_type::Varchar);
}
res = query::drop()
res = drop()
.table("quotes")
.execute(db);
REQUIRE(res.is_ok());
@@ -202,7 +202,7 @@ TEST_CASE_METHOD( QueryFixture, "Test quoted column names", "[query][quotes][col
}
TEST_CASE_METHOD(QueryFixture, "Test quoted literals", "[query][quotes][literals]") {
auto res = query::create()
auto res = create()
.table("escapes")
.columns({
attribute("name", basic_type::Varchar, 255)
@@ -212,14 +212,14 @@ TEST_CASE_METHOD(QueryFixture, "Test quoted literals", "[query][quotes][literals
REQUIRE(res->affected_rows == 0);
tables_to_drop.emplace("escapes");
res = query::insert()
res = insert()
.into("escapes", {"name"})
.values({"text"})
.execute(db);
REQUIRE(res.is_ok());
REQUIRE(res->affected_rows == 1);
auto row = query::select({"name"})
auto row = select({"name"})
.from("escapes")
.fetch_one(db);
REQUIRE(row.is_ok());
@@ -227,13 +227,13 @@ TEST_CASE_METHOD(QueryFixture, "Test quoted literals", "[query][quotes][literals
REQUIRE(row->has_value());
REQUIRE(row.value()->at("name").as<std::string>() == "text");
res = query::update("escapes")
res = update("escapes")
.set("name", "text'd")
.execute(db);
REQUIRE(res.is_ok());
REQUIRE(res->affected_rows == 1);
row = query::select({"name"})
row = select({"name"})
.from("escapes")
.fetch_one(db);
REQUIRE(row.is_ok());
@@ -241,13 +241,13 @@ TEST_CASE_METHOD(QueryFixture, "Test quoted literals", "[query][quotes][literals
REQUIRE(row->has_value());
REQUIRE(row.value()->at("name").as<std::string>() == "text'd");
res = query::update("escapes")
res = update("escapes")
.set("name", "text\nhello\tworld")
.execute(db);
REQUIRE(res.is_ok());
REQUIRE(res->affected_rows == 1);
row = query::select({"name"})
row = select({"name"})
.from("escapes")
.fetch_one(db);
REQUIRE(row.is_ok());
@@ -255,13 +255,13 @@ TEST_CASE_METHOD(QueryFixture, "Test quoted literals", "[query][quotes][literals
REQUIRE(row->has_value());
REQUIRE(row.value()->at("name").as<std::string>() == "text\nhello\tworld");
res = query::update("escapes")
res = update("escapes")
.set("name", "text \"text\"")
.execute(db);
REQUIRE(res.is_ok());
REQUIRE(res->affected_rows == 1);
row = query::select({"name"})
row = select({"name"})
.from("escapes")
.fetch_one(db);
REQUIRE(row.is_ok());
@@ -317,7 +317,7 @@ TEST_CASE_METHOD(QueryFixture, "Test describe table", "[query][describe][table]"
}
TEST_CASE_METHOD(QueryFixture, "Test unknown table", "[query][table]") {
const auto result = query::select({"name"})
const auto result = select({"name"})
.from("person")
.fetch_all(db);
@@ -346,14 +346,14 @@ TEST_CASE_METHOD(QueryFixture, "Test primary key", "[query][primary key]") {
pk pk1{ 7, "george" };
auto res = query::insert()
auto res = insert()
.into("pk", generator::columns<pk>(repo))
.values(pk1)
.execute(db);
REQUIRE(res.is_ok());
REQUIRE(res->affected_rows == 1);
auto row = query::select<pk>(repo)
auto row = select<pk>(repo)
.from("pk")
.fetch_one<pk>(db);
REQUIRE(row.is_ok());
@@ -369,7 +369,7 @@ TEST_CASE_METHOD(QueryFixture, "Test primary key prepared", "[query][primary key
pk pk1{ 7, "george" };
auto stmt = query::insert()
auto stmt = insert()
.into("pk", generator::columns<pk>(repo))
.values(generator::placeholders<pk>())
.prepare(db);
@@ -380,7 +380,7 @@ TEST_CASE_METHOD(QueryFixture, "Test primary key prepared", "[query][primary key
REQUIRE(res.is_ok());
REQUIRE(res->affected_rows == 1);
stmt = query::select<pk>(repo)
stmt = select<pk>(repo)
.from("pk")
.prepare(db);
REQUIRE(stmt);
@@ -415,7 +415,7 @@ TEST_CASE_METHOD(QueryFixture, "Test primary key prepared", "[query][primary key
// using namespace matador::test::temporary;
// using namespace matador::sql;
// REQUIRE(schema.attach<appointment>("appointment"));
// auto res = query::create()
// auto res = create()
// .table<appointment>("appointment", schema)
// .execute(db);
// REQUIRE(res.is_ok());
@@ -426,14 +426,14 @@ TEST_CASE_METHOD(QueryFixture, "Test primary key prepared", "[query][primary key
// auto time_str = matador::utils::to_string(dinner.time_point);
// auto date_str = matador::utils::to_string(dinner.date_point);
//
// res = query::insert()
// res = insert()
// .into("appointment", column_generator::generate<appointment>(schema))
// .values(dinner)
// .execute(db);
// REQUIRE(res.is_ok());
// REQUIRE(res->affected_rows == 1);
//
// auto row = query::select<appointment>(schema)
// auto row = select<appointment>(schema)
// .from("appointment")
// .fetch_one<appointment>(db);
// REQUIRE(row.is_ok());
@@ -446,7 +446,7 @@ TEST_CASE_METHOD(QueryFixture, "Test primary key prepared", "[query][primary key
// TEST_CASE_METHOD(QueryFixture, "Test null column", "[query][select][null]") {
// using namespace matador::sql;
//
// auto res = query::create()
// auto res = create()
// .table("person", {
// make_pk_column<unsigned long>("id"),
// make_column<std::string>("first_name", 255, null_option::NULLABLE),
@@ -457,21 +457,21 @@ TEST_CASE_METHOD(QueryFixture, "Test primary key prepared", "[query][primary key
// REQUIRE(res->affected_rows == 0);
// tables_to_drop.emplace("person");
//
// res = query::insert()
// res = insert()
// .into("person", {"id", "first_name"})
// .values({1, "george"})
// .execute(db);
// REQUIRE(res.is_ok());
// REQUIRE(res->affected_rows == 1);
//
// res = query::insert()
// res = insert()
// .into("person", {"id", "last_name"})
// .values({2, "clooney"})
// .execute(db);
// REQUIRE(res.is_ok());
// REQUIRE(res->affected_rows == 1);
//
// auto result = query::select({"id", "first_name", "last_name"})
// auto result = select({"id", "first_name", "last_name"})
// .from("person")
// .fetch_all(db);
// REQUIRE(result.is_ok());
@@ -491,7 +491,7 @@ TEST_CASE_METHOD(QueryFixture, "Test primary key prepared", "[query][primary key
// TEST_CASE_METHOD(QueryFixture, "Test null column prepared", "[query][select][null][prepared]") {
// using namespace matador::sql;
//
// auto res = query::create()
// auto res = create()
// .table("person", {
// make_pk_column<unsigned long>("id"),
// make_column<std::string>("first_name", 255, null_option::NULLABLE),
@@ -502,21 +502,21 @@ TEST_CASE_METHOD(QueryFixture, "Test primary key prepared", "[query][primary key
// REQUIRE(res->affected_rows == 0);
// tables_to_drop.emplace("person");
//
// res = query::insert()
// res = insert()
// .into("person", {"id", "first_name"})
// .values({1, "george"})
// .execute(db);
// REQUIRE(res.is_ok());
// REQUIRE(res->affected_rows == 1);
//
// res = query::insert()
// res = insert()
// .into("person", {"id", "last_name"})
// .values({2, "clooney"})
// .execute(db);
// REQUIRE(res.is_ok());
// REQUIRE(res->affected_rows == 1);
//
// auto result = query::select({"id", "first_name", "last_name"})
// auto result = select({"id", "first_name", "last_name"})
// .from("person")
// .fetch_all(db);
// REQUIRE(result.is_ok());