removed class query and moved their static methods to simple functions
This commit is contained in:
@@ -23,7 +23,7 @@ using namespace matador::test;
|
||||
|
||||
TEST_CASE_METHOD(QueryFixture, "Test create statement", "[query][statement][create]") {
|
||||
const auto obj = object_generator::generate<person>(repo.repo(), "persons");
|
||||
auto stmt = query::create()
|
||||
auto stmt = create()
|
||||
.table(obj->name())
|
||||
.columns(obj->attributes())
|
||||
.constraints(obj->constraints())
|
||||
@@ -54,7 +54,7 @@ TEST_CASE_METHOD(QueryFixture, "Test insert statement", "[query][statement][inse
|
||||
|
||||
person george{1, "george", 45, {1,2,3,4}};
|
||||
|
||||
auto stmt = query::insert()
|
||||
auto stmt = insert()
|
||||
.into(PERSON, {PERSON.id, PERSON.name, PERSON.age, PERSON.image})
|
||||
.values(generator::placeholders<person>())
|
||||
.prepare(db);
|
||||
@@ -65,7 +65,7 @@ TEST_CASE_METHOD(QueryFixture, "Test insert statement", "[query][statement][inse
|
||||
REQUIRE(res.is_ok());
|
||||
REQUIRE(res->affected_rows == 1);
|
||||
|
||||
auto row = query::select({PERSON.id, PERSON.name, PERSON.age, PERSON.image})
|
||||
auto row = select({PERSON.id, PERSON.name, PERSON.age, PERSON.image})
|
||||
.from(PERSON)
|
||||
.fetch_one<person>(db);
|
||||
REQUIRE(row.is_ok());
|
||||
@@ -85,7 +85,7 @@ TEST_CASE_METHOD(QueryFixture, "Test update statement", "[query][statement][upda
|
||||
|
||||
person george{1, "george", 45, {1,2,3,4}};
|
||||
|
||||
auto stmt = query::insert()
|
||||
auto stmt = insert()
|
||||
.into(PERSON, {PERSON.id, PERSON.name, PERSON.age, PERSON.image})
|
||||
.values(generator::placeholders<person>())
|
||||
.prepare(db);
|
||||
@@ -96,7 +96,7 @@ TEST_CASE_METHOD(QueryFixture, "Test update statement", "[query][statement][upda
|
||||
REQUIRE(res.is_ok());
|
||||
REQUIRE(res->affected_rows == 1);
|
||||
|
||||
auto row = query::select({PERSON.id, PERSON.name, PERSON.age, PERSON.image})
|
||||
auto row = select({PERSON.id, PERSON.name, PERSON.age, PERSON.image})
|
||||
.from(PERSON)
|
||||
.fetch_one<person>(db);
|
||||
REQUIRE(row.is_ok());
|
||||
@@ -109,7 +109,7 @@ TEST_CASE_METHOD(QueryFixture, "Test update statement", "[query][statement][upda
|
||||
|
||||
george.age = 36;
|
||||
george.image = {5,6,7,8};
|
||||
stmt = query::update(PERSON)
|
||||
stmt = update(PERSON)
|
||||
.set<person>()
|
||||
.where(PERSON.id == _)
|
||||
.prepare(db);
|
||||
@@ -121,7 +121,7 @@ TEST_CASE_METHOD(QueryFixture, "Test update statement", "[query][statement][upda
|
||||
REQUIRE(res.is_ok());
|
||||
REQUIRE(res->affected_rows == 1);
|
||||
|
||||
row = query::select({PERSON.id, PERSON.name, PERSON.age, PERSON.image})
|
||||
row = select({PERSON.id, PERSON.name, PERSON.age, PERSON.image})
|
||||
.from(PERSON)
|
||||
.fetch_one<person>(db);
|
||||
REQUIRE(row.is_ok());
|
||||
@@ -139,7 +139,7 @@ TEST_CASE_METHOD(QueryFixture, "Test delete statement", "[query][statement][dele
|
||||
|
||||
check_table_exists(PERSON.table_name());
|
||||
|
||||
auto stmt = query::insert()
|
||||
auto stmt = insert()
|
||||
.into(PERSON, {PERSON.id, PERSON.name, PERSON.age, PERSON.image})
|
||||
.values(generator::placeholders<person>())
|
||||
.prepare(db);
|
||||
@@ -160,7 +160,7 @@ TEST_CASE_METHOD(QueryFixture, "Test delete statement", "[query][statement][dele
|
||||
stmt->reset();
|
||||
}
|
||||
|
||||
auto select_stmt = query::select({PERSON.id, PERSON.name, PERSON.age, PERSON.image})
|
||||
auto select_stmt = select({PERSON.id, PERSON.name, PERSON.age, PERSON.image})
|
||||
.from(PERSON)
|
||||
.where(PERSON.name ==_)
|
||||
.prepare(db);
|
||||
@@ -178,7 +178,7 @@ TEST_CASE_METHOD(QueryFixture, "Test delete statement", "[query][statement][dele
|
||||
REQUIRE(r->image == peoples[index].image);
|
||||
}
|
||||
|
||||
stmt = query::remove()
|
||||
stmt = remove()
|
||||
.from(PERSON)
|
||||
.where(PERSON.name == _)
|
||||
.prepare(db);
|
||||
@@ -212,7 +212,7 @@ TEST_CASE_METHOD(QueryFixture, "Test reuse prepared statement", "[query][stateme
|
||||
|
||||
check_table_exists(PERSON.table_name());
|
||||
|
||||
auto stmt = query::insert()
|
||||
auto stmt = insert()
|
||||
.into(PERSON, {PERSON.id, PERSON.name, PERSON.age, PERSON.image})
|
||||
.values(generator::placeholders<person>())
|
||||
.prepare(db);
|
||||
@@ -233,7 +233,7 @@ TEST_CASE_METHOD(QueryFixture, "Test reuse prepared statement", "[query][stateme
|
||||
stmt->reset();
|
||||
}
|
||||
|
||||
stmt = query::select({PERSON.id, PERSON.name, PERSON.age, PERSON.image})
|
||||
stmt = select({PERSON.id, PERSON.name, PERSON.age, PERSON.image})
|
||||
.from(PERSON)
|
||||
.prepare(db);
|
||||
REQUIRE(stmt);
|
||||
|
||||
Reference in New Issue
Block a user