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

insert_query_builder progress

Browse Source
This commit is contained in:
sascha
2026-04-12 22:07:24 +02:00
parent f03664d60a
commit a0326632ab
25 changed files with 319 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/backends/SessionFixture.cpp
+3 -4
View File
@@ -7,8 +7,7 @@
namespace matador::test {
SessionFixture::SessionFixture()
: ses({bus, connection::dns, 4}, schema)
, db(connection::dns) {
: db(connection::dns) {
REQUIRE(db.open());
}
@@ -19,8 +18,8 @@ SessionFixture::~SessionFixture() {
}
void SessionFixture::drop_table_if_exists(const std::string &table_name) const {
if (ses.table_exists(table_name)) {
REQUIRE(ses.drop_table(table_name));
if (db.exists(table_name)) {
REQUIRE(query::drop().table(table_name).execute(db));
}
}
test/backends/SessionFixture.hpp
-3
View File
@@ -5,8 +5,6 @@
#include "matador/utils/message_bus.hpp"
#include <stack>
namespace matador::test {
class SessionFixture {
@@ -15,7 +13,6 @@ public:
~SessionFixture();
protected:
orm::session ses;
utils::message_bus bus;
sql::connection db;
test/backends/SessionInsertHasMany.cpp
+3
View File
@@ -2,6 +2,8 @@
#include "SessionFixture.hpp"
#include "connection.hpp"
#include "models/author.hpp"
#include "models/book.hpp"
@@ -15,6 +17,7 @@ TEST_CASE_METHOD(SessionFixture, "Test insert object with has many relation", "[
.and_then([this] { return schema.create(db); } );
REQUIRE(result.is_ok());
orm::session ses({bus, connection::dns, 4}, schema);
schema.initialize(ses);
auto s_king = make_object<author>(1, "Steven", "King", "21.9.1947", 1956, false);
test/backends/SessionTest.cpp
+17
View File
@@ -2,6 +2,8 @@
#include "SessionFixture.hpp"
#include "connection.hpp"
#include "models/airplane.hpp"
#include "models/author.hpp"
#include "models/book.hpp"
@@ -20,6 +22,7 @@ TEST_CASE_METHOD(SessionFixture, "Session insert test", "[session][insert]") {
.and_then([this] { return schema.create(db); } );
REQUIRE(result.is_ok());
orm::session ses({bus, connection::dns, 4}, schema);
auto plane = ses.insert(make_object<airplane>(1, "Boeing", "A380"));
REQUIRE(plane.is_ok());
@@ -36,6 +39,7 @@ TEST_CASE_METHOD(SessionFixture, "Session update test", "[session][update]") {
.and_then([this] { return schema.create(db); } );
REQUIRE(res.is_ok());
orm::session ses({bus, connection::dns, 4}, schema);
auto result = ses.insert(make_object<airplane>(1, "Boeing", "A380"));
REQUIRE(result.is_ok());
@@ -66,6 +70,8 @@ TEST_CASE_METHOD(SessionFixture, "Session delete test", "[session][delete]") {
.and_then([this] { return schema.create(db); } );
REQUIRE(res.is_ok());
orm::session ses({bus, connection::dns, 4}, schema);
schema.initialize(ses);
auto result = ses.insert(make_object<airplane>(1, "Boeing", "A380"));
@@ -90,6 +96,7 @@ TEST_CASE_METHOD(SessionFixture, "Session relation test", "[session][relation]")
.and_then([this] { return schema.create(db); } );
REQUIRE(result.is_ok());
orm::session ses({bus, connection::dns, 4}, schema);
auto plane = ses.insert(make_object<airplane>(1, "Boeing", "A380"));
REQUIRE(plane.is_ok());
auto f = ses.insert(make_object<flight>(2, *plane, "sully"));
@@ -111,6 +118,7 @@ TEST_CASE_METHOD(SessionFixture, "Use session to find object with id", "[session
.and_then([this] { return schema.create(db); } );
REQUIRE(result.is_ok());
orm::session ses({bus, connection::dns, 4}, schema);
auto a380 = ses.insert(make_object<airplane>(1, "Boeing", "A380"));
REQUIRE(a380.is_ok());
@@ -130,6 +138,8 @@ TEST_CASE_METHOD(SessionFixture, "Use session to find all objects", "[session][f
.and_then([this] { return schema.create(db); } );
REQUIRE(result.is_ok());
orm::session ses({bus, connection::dns, 4}, schema);
std::vector planes {
make_object<airplane>(1, "Airbus", "A380"),
make_object<airplane>(2, "Boeing", "707"),
@@ -165,6 +175,7 @@ TEST_CASE_METHOD(SessionFixture, "Use session to find all objects with one-to-ma
.and_then([this] { return schema.create(db); } );
REQUIRE(result.is_ok());
orm::session ses({bus, connection::dns, 4}, schema);
schema.initialize(ses);
std::vector authors {
make_object<author>(1, "Michael", "Crichton", "23.10.1942", 1975, true),
@@ -219,6 +230,8 @@ TEST_CASE_METHOD(SessionFixture, "Use session to find all objects with one-to-ma
.and_then([this] { return schema.create(db); } );
REQUIRE(result.is_ok());
orm::session ses({bus, connection::dns, 4}, schema);
std::vector departments {
make_object<department>(1, "Insurance"),
make_object<department>(2, "Invoice")
@@ -276,6 +289,8 @@ TEST_CASE_METHOD(SessionFixture, "Use session to find all objects with many-to-m
return schema.create(db);
} );
orm::session ses({bus, connection::dns, 4}, schema);
std::vector ingredients {
make_object<ingredient>(1, "Apple"),
make_object<ingredient>(2, "Strawberry"),
@@ -310,6 +325,8 @@ TEST_CASE_METHOD(SessionFixture, "Use session to find all objects with many-to-m
return schema.create(db);
} );
orm::session ses({bus, connection::dns, 4}, schema);
std::vector ingredients {
make_object<ingredient>(1, "Apple"),
make_object<ingredient>(2, "Strawberry"),
test/orm/query/InsertQueryBuilderTest.cpp
+15 -15
View File
@@ -58,19 +58,19 @@ TEST_CASE("Test insert builder has many", "[query][insert_query_builder][has_man
.and_then( [&scm] { return scm.attach<author>("authors"); } );
REQUIRE(result.is_ok());
auto s_king = make_object<author>(1, "Steven", "King", "21.9.1947", 1956, false);
s_king->books.push_back(make_object<book>(2, "Carrie", object_ptr<author>{}, 1974));
s_king->books.push_back(make_object<book>(3, "The Shining", object_ptr<author>{}, 1977));
s_king->books.push_back(make_object<book>(4, "It", object_ptr<author>{}, 1986));
s_king->books.push_back(make_object<book>(5, "Misery", object_ptr<author>{}, 1987));
s_king->books.push_back(make_object<book>(6, "The Dark Tower: The Gunslinger", object_ptr<author>{}, 1982));
insert_query_builder iqb(scm);
auto build_result = iqb.build(s_king);
REQUIRE(build_result.is_ok());
const auto& stmts = *build_result;
REQUIRE(stmts.size() == 1);
// auto s_king = make_object<author>(1, "Steven", "King", "21.9.1947", 1956, false);
//
// s_king->books.push_back(make_object<book>(2, "Carrie", object_ptr<author>{}, 1974));
// s_king->books.push_back(make_object<book>(3, "The Shining", object_ptr<author>{}, 1977));
// s_king->books.push_back(make_object<book>(4, "It", object_ptr<author>{}, 1986));
// s_king->books.push_back(make_object<book>(5, "Misery", object_ptr<author>{}, 1987));
// s_king->books.push_back(make_object<book>(6, "The Dark Tower: The Gunslinger", object_ptr<author>{}, 1982));
//
// insert_query_builder iqb(scm);
//
// auto build_result = iqb.build(s_king);
// REQUIRE(build_result.is_ok());
//
// const auto& stmts = *build_result;
// REQUIRE(stmts.size() == 1);
}
test/orm/query/QueryBuilderTest.cpp
+1 -1
View File
@@ -73,7 +73,7 @@ TEST_CASE_METHOD(QueryFixture, "Test create table sql statement string", "[query
constraint("PK_person").primary_key({"id"}),
constraint("FK_person_address").foreign_key({"address"}).references("address", {"id"})
})
.compile(*db);
.compile(db->dialect());
REQUIRE(ctx.sql == R"##(CREATE TABLE "person" ("id" BIGINT NOT NULL, "name" VARCHAR(255) NOT NULL UNIQUE, "age" INTEGER NOT NULL, "address" BIGINT NOT NULL, CONSTRAINT PK_person PRIMARY KEY (id), CONSTRAINT FK_person_address FOREIGN KEY (address) REFERENCES address (id)))##");
}
test/orm/sql/StatementCacheTest.cpp
+9 -6
View File
@@ -134,6 +134,7 @@ TEST_CASE("Test statement cache", "[statement][cache]") {
const auto stmt = result.value();
ctx.sql = "SELECT title FROM book";
ctx.sql_hash = std::hash<std::string>{}(ctx.sql);
result = cache.acquire(ctx);
REQUIRE(result);
@@ -143,6 +144,7 @@ TEST_CASE("Test statement cache", "[statement][cache]") {
REQUIRE(cache.capacity() == 2);
ctx.sql = "SELECT name FROM author";
ctx.sql_hash = std::hash<std::string>{}(ctx.sql);
result = cache.acquire(ctx);
REQUIRE(result);
@@ -163,18 +165,19 @@ TEST_CASE("Test LRU cache evicts oldest entries", "[statement][cache][evict]") {
REQUIRE(cache.capacity() == 2);
REQUIRE(cache.empty());
auto result = cache.acquire({"SELECT * FROM person"});
auto result = cache.acquire({"SELECT * FROM person", std::hash<std::string>{}("SELECT * FROM person")});
REQUIRE(result);
auto stmt1 = result.value();
result = cache.acquire({"SELECT title FROM book"});
result = cache.acquire({"SELECT title FROM book", std::hash<std::string>{}("SELECT title FROM book")});
REQUIRE(result);
auto stmt2 = result.value();
result = cache.acquire({"SELECT name FROM author"}); // Should evict the first statement
result = cache.acquire({"SELECT name FROM author", std::hash<std::string>{}("SELECT name FROM author")}); // Should evict the first statement
REQUIRE(result);
auto stmt3 = result.value();
// Trigger re-prepares of an evicted statement
result = cache.acquire({"SELECT 1"});
result = cache.acquire({"SELECT 1", std::hash<std::string>{}("SELECT 1")});
REQUIRE(result);
auto stmt4 = result.value();
@@ -211,10 +214,10 @@ TEST_CASE("Test statement reuse avoids reprepare", "[statement][cache][prepare]"
REQUIRE(cache.capacity() == 2);
REQUIRE(cache.empty());
auto result = cache.acquire({"SELECT * FROM person"});
auto result = cache.acquire({"SELECT * FROM person", std::hash<std::string>{}("SELECT * FROM person")});
REQUIRE(result);
auto stmt1 = result.value();
result = cache.acquire({"SELECT * FROM person"});
result = cache.acquire({"SELECT * FROM person", std::hash<std::string>{}("SELECT * FROM person")});
REQUIRE(result);
auto stmt2 = result.value();
}