query parts progress

This commit is contained in:
2024-02-24 18:16:23 +01:00
parent 0822332669
commit 6f5326941e
31 changed files with 887 additions and 381 deletions
+64 -62
View File
@@ -14,6 +14,7 @@ class QueryRecordFixture
public:
QueryRecordFixture()
: db(matador::test::connection::dns)
, schema(std::make_shared<matador::sql::schema>(db.dialect().default_schema_name()))
{
db.open();
}
@@ -26,11 +27,12 @@ public:
protected:
matador::sql::connection db;
std::shared_ptr<matador::sql::schema> schema;
private:
void drop_table_if_exists(const std::string &table_name) {
if (db.exists(table_name)) {
db.query().drop().table(table_name).execute();
db.query(schema).drop().table(table_name).execute();
}
}
};
@@ -40,7 +42,7 @@ using namespace matador::sql;
TEST_CASE_METHOD(QueryRecordFixture, " Create and drop table statement", "[session][record]")
{
REQUIRE(!db.exists("person"));
db.query().create()
db.query(schema).create()
.table("person", {
make_pk_column<unsigned long>("id"),
make_column<std::string>("name", 255),
@@ -50,7 +52,7 @@ TEST_CASE_METHOD(QueryRecordFixture, " Create and drop table statement", "[sessi
REQUIRE(db.exists("person"));
db.query().drop()
db.query(schema).drop()
.table("person")
.execute();
@@ -59,7 +61,7 @@ TEST_CASE_METHOD(QueryRecordFixture, " Create and drop table statement", "[sessi
TEST_CASE_METHOD(QueryRecordFixture, " Create and drop table statement with foreign key", "[session][record]")
{
db.query().create()
db.query(schema).create()
.table("airplane", {
make_pk_column<unsigned long>("id"),
make_column<std::string>("brand", 255),
@@ -69,7 +71,7 @@ TEST_CASE_METHOD(QueryRecordFixture, " Create and drop table statement with fore
REQUIRE(db.exists("airplane"));
db.query().create()
db.query(schema).create()
.table("flight", {
make_pk_column<unsigned long>("id"),
make_fk_column<unsigned long>("airplane_id", "airplane", "id"),
@@ -79,13 +81,13 @@ TEST_CASE_METHOD(QueryRecordFixture, " Create and drop table statement with fore
REQUIRE(db.exists("flight"));
db.query().drop()
db.query(schema).drop()
.table("flight")
.execute();
REQUIRE(!db.exists("flight"));
db.query().drop()
db.query(schema).drop()
.table("airplane")
.execute();
@@ -94,7 +96,7 @@ TEST_CASE_METHOD(QueryRecordFixture, " Create and drop table statement with fore
TEST_CASE_METHOD(QueryRecordFixture, " Execute insert record statement", "[session][record]")
{
db.query().create()
db.query(schema).create()
.table("person", {
make_pk_column<unsigned long>("id"),
make_column<std::string>("name", 255),
@@ -102,14 +104,14 @@ TEST_CASE_METHOD(QueryRecordFixture, " Execute insert record statement", "[sessi
})
.execute();
auto res = db.query().insert()
auto res = db.query(schema).insert()
.into("person", {"id", "name", "age"})
.values({7, "george", 45})
.execute();
REQUIRE(res == 1);
auto result = db.query().select({"id", "name", "age"})
auto result = db.query(schema).select({"id", "name", "age"})
.from("person")
.fetch_all();
@@ -126,14 +128,14 @@ TEST_CASE_METHOD(QueryRecordFixture, " Execute insert record statement", "[sessi
REQUIRE(i.at(2).template as<int>() == 45);
}
db.query().drop()
db.query(schema).drop()
.table("person")
.execute();
}
TEST_CASE_METHOD(QueryRecordFixture, " Execute insert record statement with foreign key", "[session][record]")
{
db.query().create()
db.query(schema).create()
.table("airplane", {
make_pk_column<unsigned long>("id"),
make_column<std::string>("brand", 255),
@@ -141,7 +143,7 @@ TEST_CASE_METHOD(QueryRecordFixture, " Execute insert record statement with fore
})
.execute();
db.query().create()
db.query(schema).create()
.table("flight", {
make_pk_column<unsigned long>("id"),
make_fk_column<unsigned long>("airplane_id", "airplane", "id"),
@@ -149,23 +151,23 @@ TEST_CASE_METHOD(QueryRecordFixture, " Execute insert record statement with fore
})
.execute();
auto res = db.query().insert().into("airplane", {"id", "brand", "model"}).values({1, "Airbus", "A380"}).execute();
auto res = db.query(schema).insert().into("airplane", {"id", "brand", "model"}).values({1, "Airbus", "A380"}).execute();
REQUIRE(res == 1);
res = db.query().insert().into("airplane", {"id", "brand", "model"}).values({2, "Boeing", "707"}).execute();
res = db.query(schema).insert().into("airplane", {"id", "brand", "model"}).values({2, "Boeing", "707"}).execute();
REQUIRE(res == 1);
res = db.query().insert().into("airplane", {"id", "brand", "model"}).values({3, "Boeing", "747"}).execute();
res = db.query(schema).insert().into("airplane", {"id", "brand", "model"}).values({3, "Boeing", "747"}).execute();
REQUIRE(res == 1);
auto count = db.query().select({count_all()}).from("airplane").fetch_value<int>();
auto count = db.query(schema).select({count_all()}).from("airplane").fetch_value<int>();
REQUIRE(count == 3);
res = db.query().insert().into("flight", {"id", "airplane_id", "pilot_name"}).values({4, 1, "George"}).execute();
res = db.query(schema).insert().into("flight", {"id", "airplane_id", "pilot_name"}).values({4, 1, "George"}).execute();
REQUIRE(res == 1);
db.query().drop().table("flight").execute();
db.query().drop().table("airplane").execute();
db.query(schema).drop().table("flight").execute();
db.query(schema).drop().table("airplane").execute();
REQUIRE(!db.exists("flight"));
REQUIRE(!db.exists("airplane"));
@@ -173,7 +175,7 @@ TEST_CASE_METHOD(QueryRecordFixture, " Execute insert record statement with fore
TEST_CASE_METHOD(QueryRecordFixture, " Execute update record statement", "[session][record]")
{
db.query().create()
db.query(schema).create()
.table("person", {
make_pk_column<unsigned long>("id"),
make_column<std::string>("name", 255),
@@ -181,14 +183,14 @@ TEST_CASE_METHOD(QueryRecordFixture, " Execute update record statement", "[sessi
})
.execute();
auto res = db.query().insert()
auto res = db.query(schema).insert()
.into("person", {"id", "name", "age"})
.values({7, "george", 45})
.execute();
REQUIRE(res == 1);
res = db.query().update("person")
res = db.query(schema).update("person")
.set({{"id", 7},
{"name", "jane"},
{"age", 35}})
@@ -197,7 +199,7 @@ TEST_CASE_METHOD(QueryRecordFixture, " Execute update record statement", "[sessi
REQUIRE(res == 1);
auto result = db.query().select({"id", "name", "age"})
auto result = db.query(schema).select({"id", "name", "age"})
.from("person")
.fetch_all();
@@ -214,12 +216,12 @@ TEST_CASE_METHOD(QueryRecordFixture, " Execute update record statement", "[sessi
REQUIRE(i.at(2).as<int>() == 35);
}
db.query().drop().table("person").execute();
db.query(schema).drop().table("person").execute();
}
TEST_CASE_METHOD(QueryRecordFixture, " Execute select statement", "[session][record]")
{
db.query().create()
db.query(schema).create()
.table("person", {
make_pk_column<unsigned long>("id"),
make_column<std::string>("name", 255),
@@ -227,16 +229,16 @@ TEST_CASE_METHOD(QueryRecordFixture, " Execute select statement", "[session][rec
})
.execute();
auto res = db.query().insert().into("person", {"id", "name", "age"}).values({1, "george", 45}).execute();
auto res = db.query(schema).insert().into("person", {"id", "name", "age"}).values({1, "george", 45}).execute();
REQUIRE(res == 1);
res = db.query().insert().into("person", {"id", "name", "age"}).values({2, "jane", 32}).execute();
res = db.query(schema).insert().into("person", {"id", "name", "age"}).values({2, "jane", 32}).execute();
REQUIRE(res == 1);
res = db.query().insert().into("person", {"id", "name", "age"}).values({3, "michael", 67}).execute();
res = db.query(schema).insert().into("person", {"id", "name", "age"}).values({3, "michael", 67}).execute();
REQUIRE(res == 1);
res = db.query().insert().into("person", {"id", "name", "age"}).values({4, "bob", 13}).execute();
res = db.query(schema).insert().into("person", {"id", "name", "age"}).values({4, "bob", 13}).execute();
REQUIRE(res == 1);
auto result = db.query().select({"id", "name", "age"})
auto result = db.query(schema).select({"id", "name", "age"})
.from("person")
.fetch_all();
@@ -247,22 +249,22 @@ TEST_CASE_METHOD(QueryRecordFixture, " Execute select statement", "[session][rec
}
REQUIRE(expected_names.empty());
auto rec = db.query().select({"id", "name", "age"})
auto rec = db.query(schema).select({"id", "name", "age"})
.from("person")
.fetch_one();
REQUIRE(rec.at(1).str() == "george");
auto name = db.query().select({"name"})
auto name = db.query(schema).select({"name"})
.from("person")
.fetch_value<std::string>();
REQUIRE(name == "george");
db.query().drop().table("person").execute();
db.query(schema).drop().table("person").execute();
}
TEST_CASE_METHOD(QueryRecordFixture, " Execute select statement with order by", "[session][record]")
{
db.query().create()
db.query(schema).create()
.table("person", {
make_pk_column<unsigned long>("id"),
make_column<std::string>("name", 255),
@@ -270,16 +272,16 @@ TEST_CASE_METHOD(QueryRecordFixture, " Execute select statement with order by",
})
.execute();
auto res = db.query().insert().into("person", {"id", "name", "age"}).values({1, "george", 45}).execute();
auto res = db.query(schema).insert().into("person", {"id", "name", "age"}).values({1, "george", 45}).execute();
REQUIRE(res == 1);
res = db.query().insert().into("person", {"id", "name", "age"}).values({2, "jane", 32}).execute();
res = db.query(schema).insert().into("person", {"id", "name", "age"}).values({2, "jane", 32}).execute();
REQUIRE(res == 1);
res = db.query().insert().into("person", {"id", "name", "age"}).values({3, "michael", 67}).execute();
res = db.query(schema).insert().into("person", {"id", "name", "age"}).values({3, "michael", 67}).execute();
REQUIRE(res == 1);
res = db.query().insert().into("person", {"id", "name", "age"}).values({4, "bob", 13}).execute();
res = db.query(schema).insert().into("person", {"id", "name", "age"}).values({4, "bob", 13}).execute();
REQUIRE(res == 1);
auto result = db.query().select({"id", "name", "age"})
auto result = db.query(schema).select({"id", "name", "age"})
.from("person")
.order_by("name").asc()
.fetch_all();
@@ -291,12 +293,12 @@ TEST_CASE_METHOD(QueryRecordFixture, " Execute select statement with order by",
}
REQUIRE(expected_names.empty());
db.query().drop().table("person").execute();
db.query(schema).drop().table("person").execute();
}
TEST_CASE_METHOD(QueryRecordFixture, " Execute select statement with group by and order by", "[session][record]")
{
db.query().create()
db.query(schema).create()
.table("person", {
make_pk_column<unsigned long>("id"),
make_column<std::string>("name", 255),
@@ -304,18 +306,18 @@ TEST_CASE_METHOD(QueryRecordFixture, " Execute select statement with group by an
})
.execute();
auto res = db.query().insert().into("person", {"id", "name", "age"}).values({1, "george", 45}).execute();
auto res = db.query(schema).insert().into("person", {"id", "name", "age"}).values({1, "george", 45}).execute();
REQUIRE(res == 1);
res = db.query().insert().into("person", {"id", "name", "age"}).values({2, "jane", 45}).execute();
res = db.query(schema).insert().into("person", {"id", "name", "age"}).values({2, "jane", 45}).execute();
REQUIRE(res == 1);
res = db.query().insert().into("person", {"id", "name", "age"}).values({3, "michael", 13}).execute();
res = db.query(schema).insert().into("person", {"id", "name", "age"}).values({3, "michael", 13}).execute();
REQUIRE(res == 1);
res = db.query().insert().into("person", {"id", "name", "age"}).values({4, "bob", 13}).execute();
res = db.query(schema).insert().into("person", {"id", "name", "age"}).values({4, "bob", 13}).execute();
REQUIRE(res == 1);
res = db.query().insert().into("person", {"id", "name", "age"}).values({5, "charlie", 67}).execute();
res = db.query(schema).insert().into("person", {"id", "name", "age"}).values({5, "charlie", 67}).execute();
REQUIRE(res == 1);
auto result = db.query().select({alias(count("age"), "age_count"), "age"})
auto result = db.query(schema).select({alias(count("age"), "age_count"), "age"})
.from("person")
.group_by("age")
.order_by("age_count").desc()
@@ -330,41 +332,41 @@ TEST_CASE_METHOD(QueryRecordFixture, " Execute select statement with group by an
expected_values.pop_front();
}
db.query().drop().table("person").execute();
db.query(schema).drop().table("person").execute();
}
TEST_CASE_METHOD(QueryRecordFixture, " Execute delete statement", "[session][record]")
{
db.query().create()
db.query(schema).create()
.table("person", {
make_pk_column<unsigned long>("id"),
make_column<std::string>("name", 255),
make_column<unsigned short>("age")
}).execute();
auto res = db.query().insert().into("person", {"id", "name", "age"}).values({1, "george", 45}).execute();
auto res = db.query(schema).insert().into("person", {"id", "name", "age"}).values({1, "george", 45}).execute();
REQUIRE(res == 1);
res = db.query().insert().into("person", {"id", "name", "age"}).values({2, "jane", 45}).execute();
res = db.query(schema).insert().into("person", {"id", "name", "age"}).values({2, "jane", 45}).execute();
REQUIRE(res == 1);
auto count = db.query().select({count_all()}).from("person").fetch_value<int>();
auto count = db.query(schema).select({count_all()}).from("person").fetch_value<int>();
REQUIRE(count == 2);
res = db.query().remove()
res = db.query(schema).remove()
.from("person")
.where("id"_col == 1)
.execute();
REQUIRE(res == 1);
count = db.query().select({count_all()}).from("person").fetch_value<int>();
count = db.query(schema).select({count_all()}).from("person").fetch_value<int>();
REQUIRE(count == 1);
db.query().drop().table("person").execute();
db.query(schema).drop().table("person").execute();
}
TEST_CASE_METHOD(QueryRecordFixture, " Test quoted identifier", "[session][record]") {
db.query().create()
db.query(schema).create()
.table("quotes", {
make_column<std::string>("from", 255),
make_column<std::string>("to", 255)
@@ -380,19 +382,19 @@ TEST_CASE_METHOD(QueryRecordFixture, " Test quoted identifier", "[session][recor
REQUIRE(field.type() == types[field.index()]);
}
db.query().insert().into("quotes", {"from", "to"}).values({"Berlin", "London"}).execute();
db.query(schema).insert().into("quotes", {"from", "to"}).values({"Berlin", "London"}).execute();
auto res = db.query().select({"from", "to"}).from("quotes").fetch_one();
auto res = db.query(schema).select({"from", "to"}).from("quotes").fetch_one();
REQUIRE("Berlin" == res.at("from").str());
REQUIRE("London" == res.at("to").str());
db.query().update("quotes").set({{"from", "Hamburg"}, {"to", "New York"}}).where("from"_col == "Berlin").execute();
db.query(schema).update("quotes").set({{"from", "Hamburg"}, {"to", "New York"}}).where("from"_col == "Berlin").execute();
res = db.query().select({"from", "to"}).from("quotes").fetch_one();
res = db.query(schema).select({"from", "to"}).from("quotes").fetch_one();
REQUIRE("Hamburg" == res.at("from").str());
REQUIRE("New York" == res.at("to").str());
db.query().drop().table("quotes").execute();
db.query(schema).drop().table("quotes").execute();
}
+36 -32
View File
@@ -19,6 +19,7 @@ class QueryFixture
public:
QueryFixture()
: db(matador::test::connection::dns)
, schema(std::make_shared<matador::sql::schema>(db.dialect().default_schema_name()))
{
db.open();
}
@@ -32,32 +33,33 @@ public:
protected:
matador::sql::connection db;
std::shared_ptr<matador::sql::schema> schema;
private:
void drop_table_if_exists(const std::string &table_name)
{
if (db.exists(table_name)) {
db.query().drop().table(table_name).execute();
db.query(schema).drop().table(table_name).execute();
}
}
};
TEST_CASE_METHOD(QueryFixture, " Create table with foreign key relation", "[session]")
{
db.query().create()
db.query(schema).create()
.table<airplane>("airplane")
.execute();
REQUIRE(db.exists("airplane"));
db.query().create()
db.query(schema).create()
.table<flight>("flight")
.execute();
REQUIRE(db.exists("flight"));
db.query().drop().table("flight").execute();
db.query().drop().table("airplane").execute();
db.query(schema).drop().table("flight").execute();
db.query(schema).drop().table("airplane").execute();
REQUIRE(!db.exists("flight"));
REQUIRE(!db.exists("airplane"));
@@ -65,20 +67,22 @@ TEST_CASE_METHOD(QueryFixture, " Create table with foreign key relation", "[sess
TEST_CASE_METHOD(QueryFixture, " Execute select statement with where clause", "[session]")
{
db.query().create()
db.query(schema).create()
.table<person>("person")
.execute();
person george{7, "george", 45};
george.image.push_back(37);
auto res = db.query().insert()
.into("person", george)
auto res = db.query(schema)
.insert()
.into<person>("person")
.values(george)
.execute();
REQUIRE(res == 1);
// fetch person as record
auto result_record = db.query().select<person>()
auto result_record = db.query(schema).select<person>()
.from("person")
.where("id"_col == 7)
.fetch_all();
@@ -97,7 +101,7 @@ TEST_CASE_METHOD(QueryFixture, " Execute select statement with where clause", "[
}
// fetch person as person
auto result_person = db.query().select<person>()
auto result_person = db.query(schema).select<person>()
.from("person")
.where("id"_col == 7)
.fetch_all<person>();
@@ -108,12 +112,12 @@ TEST_CASE_METHOD(QueryFixture, " Execute select statement with where clause", "[
REQUIRE(i.age == 45);
}
db.query().drop().table("person").execute();
db.query(schema).drop().table("person").execute();
}
TEST_CASE_METHOD(QueryFixture, " Execute insert statement", "[session]")
{
db.query().create()
db.query(schema).create()
.table("person", {
make_pk_column<unsigned long>("id"),
make_column<std::string>("name", 255),
@@ -121,7 +125,7 @@ TEST_CASE_METHOD(QueryFixture, " Execute insert statement", "[session]")
})
.execute();
auto res = db.query().insert()
auto res = db.query(schema).insert()
.into("person", {{"", "id", ""}, {"", "name", ""}, {"", "color", ""}})
.values({7, "george", "green"})
.execute();
@@ -129,7 +133,7 @@ TEST_CASE_METHOD(QueryFixture, " Execute insert statement", "[session]")
REQUIRE(res == 1);
// fetch person as record
auto result_record = db.query().select({"id", "name", "color"})
auto result_record = db.query(schema).select({"id", "name", "color"})
.from("person")
.where("id"_col == 7)
.fetch_all();
@@ -147,16 +151,16 @@ TEST_CASE_METHOD(QueryFixture, " Execute insert statement", "[session]")
REQUIRE(i.at(2).as<std::string>() == "green");
}
db.query().drop().table("person").execute();
db.query(schema).drop().table("person").execute();
}
TEST_CASE_METHOD(QueryFixture, " Select statement with foreign key", "[session]")
{
db.query().create()
db.query(schema).create()
.table<airplane>("airplane")
.execute();
db.query().create()
db.query(schema).create()
.table<flight>("flight")
.execute();
@@ -167,35 +171,35 @@ TEST_CASE_METHOD(QueryFixture, " Select statement with foreign key", "[session]"
};
for (const auto &plane: planes) {
auto res = db.query().insert().into<airplane>("airplane").values(*plane).execute();
auto res = db.query(schema).insert().into<airplane>("airplane").values(*plane).execute();
REQUIRE(res == 1);
}
auto count = db.query().select({count_all()}).from("airplane").fetch_value<int>();
auto count = db.query(schema).select({count_all()}).from("airplane").fetch_value<int>();
REQUIRE(count == 3);
flight f4711{4, planes.at(1), "hans"};
auto res = db.query().insert().into<flight>("flight").values(f4711).execute();
auto res = db.query(schema).insert().into<flight>("flight").values(f4711).execute();
REQUIRE(res == 1);
auto f = *db.query().select<flight>().from("flight").fetch_all<flight>().begin();
auto f = *db.query(schema).select<flight>().from("flight").fetch_all<flight>().begin();
REQUIRE(f.id == 4);
REQUIRE(f.pilot_name == "hans");
REQUIRE(f.airplane.get() != nullptr);
REQUIRE(f.airplane->id == 2);
db.query().drop().table("flight").execute();
db.query().drop().table("airplane").execute();
db.query(schema).drop().table("flight").execute();
db.query(schema).drop().table("airplane").execute();
}
TEST_CASE_METHOD(QueryFixture, " Select statement with foreign key and join_left", "[session][join_left]")
{
db.query().create()
db.query(schema).create()
.table<airplane>("airplane")
.execute();
db.query().create()
db.query(schema).create()
.table<flight>("flight")
.execute();
@@ -206,11 +210,11 @@ TEST_CASE_METHOD(QueryFixture, " Select statement with foreign key and join_left
};
for (const auto &plane: planes) {
auto res = db.query().insert().into<airplane>("airplane").values(*plane).execute();
auto res = db.query(schema).insert().into<airplane>("airplane").values(*plane).execute();
REQUIRE(res == 1);
}
auto count = db.query().select({count_all()}).from("airplane").fetch_value<int>();
auto count = db.query(schema).select({count_all()}).from("airplane").fetch_value<int>();
REQUIRE(count == 3);
std::vector<entity<flight>> flights{
@@ -221,17 +225,17 @@ TEST_CASE_METHOD(QueryFixture, " Select statement with foreign key and join_left
};
for (const auto &f: flights) {
auto res = db.query().insert().into<flight>("flight").values(*f).execute();
auto res = db.query(schema).insert().into<flight>("flight").values(*f).execute();
REQUIRE(res == 1);
}
auto f = *db.query().select<flight>().from("flight").fetch_all<flight>().begin();
auto f = *db.query(schema).select<flight>().from("flight").fetch_all<flight>().begin();
REQUIRE(f.id == 4);
REQUIRE(f.pilot_name == "hans");
REQUIRE(f.airplane.get() != nullptr);
REQUIRE(f.airplane->id == 1);
auto result = db.query().select({"f.id", "ap.brand", "ap.model", "f.pilot_name"})
auto result = db.query(schema).select({"f.id", "ap.brand", "ap.model", "f.pilot_name"})
.from({"flight", "f"})
.join_left({"airplane", "ap"})
.on("f.airplane_id"_col == "ap.id"_col)
@@ -251,7 +255,7 @@ TEST_CASE_METHOD(QueryFixture, " Select statement with foreign key and join_left
REQUIRE(r.at(3).as<std::string>() == expected_result[index++].second);
}
db.query().drop().table("flight").execute();
db.query().drop().table("airplane").execute();
db.query(schema).drop().table("flight").execute();
db.query(schema).drop().table("airplane").execute();
}
+8 -6
View File
@@ -16,9 +16,10 @@ class StatementTestFixture
public:
StatementTestFixture()
: db(matador::test::connection::dns)
, schema(std::make_shared<matador::sql::schema>(db.dialect().default_schema_name()))
{
db.open();
db.query().create().table<airplane>("airplane").execute();
db.query(schema).create().table<airplane>("airplane").execute();
}
~StatementTestFixture()
@@ -28,6 +29,7 @@ public:
protected:
matador::sql::connection db;
std::shared_ptr<matador::sql::schema> schema;
std::vector<entity<airplane>> planes{
make_entity<airplane>(1, "Airbus", "A380"),
@@ -38,7 +40,7 @@ protected:
private:
void drop_table_if_exists(const std::string &table_name) {
if (db.exists(table_name)) {
db.query().drop().table(table_name).execute();
db.query(schema).drop().table(table_name).execute();
}
}
@@ -48,7 +50,7 @@ TEST_CASE_METHOD(StatementTestFixture, " Create prepared statement", "[statement
{
table ap{"airplane"};
SECTION("Insert with prepared statement and placeholder") {
auto stmt = db.query().insert()
auto stmt = db.query(schema).insert()
.into<airplane>("airplane")
.values<airplane>().prepare();
@@ -58,7 +60,7 @@ TEST_CASE_METHOD(StatementTestFixture, " Create prepared statement", "[statement
stmt.reset();
}
auto result = db.query().select<airplane>().from(ap).fetch_all<airplane>();
auto result = db.query(schema).select<airplane>().from(ap).fetch_all<airplane>();
size_t index{0};
for (const auto &i: result) {
@@ -70,11 +72,11 @@ TEST_CASE_METHOD(StatementTestFixture, " Create prepared statement", "[statement
SECTION("Select with prepared statement") {
for (const auto &plane: planes) {
auto res = db.query().insert().into<airplane>("airplane").values(*plane).execute();
auto res = db.query(schema).insert().into<airplane>("airplane").values(*plane).execute();
REQUIRE(res == 1);
}
auto stmt = db.query().select<airplane>().from(ap).where("brand"_col == _).prepare();
auto stmt = db.query(schema).select<airplane>().from(ap).where("brand"_col == _).prepare();
stmt.bind(0, "Airbus");
+9 -7
View File
@@ -15,25 +15,27 @@ class TypeTraitsTestFixture
public:
TypeTraitsTestFixture()
: db(matador::test::connection::dns)
, schema(std::make_shared<matador::sql::schema>(db.dialect().default_schema_name()))
{
db.open();
db.query().create()
db.query(schema).create()
.table<location>("location")
.execute();
}
~TypeTraitsTestFixture()
{
db.query().drop().table("location").execute();
db.query(schema).drop().table("location").execute();
}
protected:
matador::sql::connection db;
std::shared_ptr<matador::sql::schema> schema;
private:
void drop_table_if_exists(const std::string &table_name) {
if (db.exists(table_name)) {
db.query().drop().table(table_name).execute();
db.query(schema).drop().table(table_name).execute();
}
}
};
@@ -85,10 +87,10 @@ TEST_CASE_METHOD(TypeTraitsTestFixture, "Special handling of attributes with typ
SECTION("Insert and select with direct execution") {
location loc{1, "center", {1, 2, 3}, Color::Black};
auto res = db.query().insert().into<location>("location").values(loc).execute();
auto res = db.query(schema).insert().into<location>("location").values(loc).execute();
REQUIRE(res == 1);
auto result = db.query().select<location>().from("location").fetch_all<location>();
auto result = db.query(schema).select<location>().from("location").fetch_all<location>();
for (const auto &l: result) {
REQUIRE(l.name == "center");
@@ -98,11 +100,11 @@ TEST_CASE_METHOD(TypeTraitsTestFixture, "Special handling of attributes with typ
SECTION("Insert and select with prepared statement") {
location loc{1, "center", {1, 2, 3}, Color::Black};
auto stmt = db.query().insert().into<location>("location").values<location>().prepare();
auto stmt = db.query(schema).insert().into<location>("location").values<location>().prepare();
auto res = stmt.bind(loc).execute();
REQUIRE(res == 1);
auto result = db.query().select<location>().from("location").
auto result = db.query(schema).select<location>().from("location").
template fetch_all<location>();
for (const auto &l: result) {