From 886194250f789b0eb989646cbab79788d56c6adc Mon Sep 17 00:00:00 2001 From: Sangwan Kwon Date: Tue, 4 Feb 2020 18:39:14 +0900 Subject: [PATCH] query-builder: Refactor insert interface Signed-off-by: Sangwan Kwon --- src/vist/policy/policy-storage.cpp | 6 +++--- src/vist/query-builder/crud.hpp | 2 +- src/vist/query-builder/tests/query-builder.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/vist/policy/policy-storage.cpp b/src/vist/policy/policy-storage.cpp index 2dd390c..2d0305f 100644 --- a/src/vist/policy/policy-storage.cpp +++ b/src/vist/policy/policy-storage.cpp @@ -124,8 +124,8 @@ void PolicyStorage::define(const std::string& policy, const PolicyValue& ivalue) PolicyDefinition pd = { policy, ivalue.dump() }; - std::string query = schema::policyDefinition.insert(&PolicyDefinition::name, - &PolicyDefinition::ivalue); + std::string query = schema::PolicyDefinitionTable.insert(PolicyDefinition::Name, + PolicyDefinition::Ivalue); database::Statement stmt(*database, query); stmt.bind(1, pd.name); stmt.bind(2, pd.ivalue); @@ -147,7 +147,7 @@ void PolicyStorage::enroll(const std::string& name) /// Make admin deactivated as default. Admin admin = {name , 0}; - std::string query = schema::admin.insert(&Admin::name, &Admin::activated); + std::string query = schema::AdminTable.insert(Admin::Name, Admin::Activated); database::Statement stmt(*database, query); stmt.bind(1, admin.name); stmt.bind(2, admin.activated); diff --git a/src/vist/query-builder/crud.hpp b/src/vist/query-builder/crud.hpp index 6fd4a34..ae4b578 100644 --- a/src/vist/query-builder/crud.hpp +++ b/src/vist/query-builder/crud.hpp @@ -153,7 +153,7 @@ T& Crud::insert(ColumnTypes&&... cts) { static_cast(this)->cache.clear(); - auto columnNames = static_cast(this)->getColumnNames(std::forward(cts)...); + auto columnNames = static_cast(this)->_getColumnNames(std::forward(cts)...); std::stringstream ss; ss << "INSERT INTO " << static_cast(this)->name << " ("; diff --git a/src/vist/query-builder/tests/query-builder.cpp b/src/vist/query-builder/tests/query-builder.cpp index 23a75b1..9fccaae 100644 --- a/src/vist/query-builder/tests/query-builder.cpp +++ b/src/vist/query-builder/tests/query-builder.cpp @@ -147,8 +147,8 @@ TEST(QueryBuilderTsqbTests, DELETE) TEST(QueryBuilderTsqbTests, INSERT) { - std::string insert1 = admin.insert(&Admin::id, &Admin::pkg, &Admin::uid, &Admin::key); - std::string insert2 = admin.insert(&Admin::id, &Admin::pkg, &Admin::key); + std::string insert1 = AdminTable.insert(Admin::Id, Admin::Pkg, Admin::Uid, Admin::Key); + std::string insert2 = AdminTable.insert(Admin::Id, Admin::Pkg, Admin::Key); EXPECT_EQ(insert1, "INSERT INTO admin (id, pkg, uid, key) VALUES (?, ?, ?, ?)"); EXPECT_EQ(insert2, "INSERT INTO admin (id, pkg, key) VALUES (?, ?, ?)"); -- 2.7.4