Skip to content

Commit

Permalink
add clear_bindgins() in statement.
Browse files Browse the repository at this point in the history
  • Loading branch information
@iwongu
iwongu committed Nov 5, 2023
1 parent b7e2f8b commit 2534d35
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 16 deletions.
1 change: 1 addition & 0 deletions headeronly_src/sqlite3pp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ namespace sqlite3pp

int step();
int reset();
int clear_bindings();

protected:
explicit statement(database& db, char const* stmt = nullptr);
Expand Down
5 changes: 5 additions & 0 deletions headeronly_src/sqlite3pp.ipp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,11 @@ namespace sqlite3pp
return sqlite3_reset(stmt_);
}

inline int statement::clear_bindings()
{
return sqlite3_clear_bindings(stmt_);
}

inline int statement::bind(int idx, int value)
{
return sqlite3_bind_int(stmt_, idx, value);
Expand Down
55 changes: 39 additions & 16 deletions test/testdb.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ using namespace std;
if(!((arg1) == (arg2))) { \
std::cout << "Unexpected false at " \
<< __FILE__ << ", " << __LINE__ << ", " << __func__ << ": " \
<< #arg1 << ", " << #arg2 << "(" << arg2 << ")" << std::endl; } \
<< #arg1 << ", " << #arg2 << std::endl; } \
} while(false);

sqlite3pp::database contacts_db();

void test_insert_execute() {
auto db = contacts_db();
db.execute("INSERT INTO contacts (name, phone) VALUES ('Mike', '555-1234')");
expect_eq(0, db.execute("INSERT INTO contacts (name, phone) VALUES ('Mike', '555-1234')"));

sqlite3pp::query qry(db, "SELECT name, phone FROM contacts");
auto iter = qry.begin();
Expand All @@ -45,7 +45,7 @@ void test_insert_execute_all() {
"INSERT INTO contacts (name, phone) VALUES (:user, '555-1111');"
"INSERT INTO contacts (name, phone) VALUES (:user, '555-2222')");
cmd.bind(":user", "Mike", sqlite3pp::nocopy);
cmd.execute_all();
expect_eq(0, cmd.execute_all());

sqlite3pp::query qry(db, "SELECT COUNT(*) FROM contacts");
auto iter = qry.begin();
Expand All @@ -57,7 +57,7 @@ void test_insert_binder() {
auto db = contacts_db();
sqlite3pp::command cmd(db, "INSERT INTO contacts (name, phone) VALUES (?, ?)");
cmd.binder() << "Mike" << "555-1234";
cmd.execute();
expect_eq(0, cmd.execute());

sqlite3pp::query qry(db, "SELECT name, phone FROM contacts");
auto iter = qry.begin();
Expand All @@ -72,7 +72,7 @@ void test_insert_bind1() {
sqlite3pp::command cmd(db, "INSERT INTO contacts (name, phone) VALUES (?, ?)");
cmd.bind(1, "Mike", sqlite3pp::nocopy);
cmd.bind(2, "555-1234", sqlite3pp::nocopy);
cmd.execute();
expect_eq(0, cmd.execute());

sqlite3pp::query qry(db, "SELECT name, phone FROM contacts");
auto iter = qry.begin();
Expand All @@ -87,7 +87,7 @@ void test_insert_bind2() {
sqlite3pp::command cmd(db, "INSERT INTO contacts (name, phone) VALUES (?100, ?101)");
cmd.bind(100, "Mike", sqlite3pp::nocopy);
cmd.bind(101, "555-1234", sqlite3pp::nocopy);
cmd.execute();
expect_eq(0, cmd.execute());

sqlite3pp::query qry(db, "SELECT name, phone FROM contacts");
auto iter = qry.begin();
Expand All @@ -102,7 +102,7 @@ void test_insert_bind3() {
sqlite3pp::command cmd(db, "INSERT INTO contacts (name, phone) VALUES (:user, :phone)");
cmd.bind(":user", "Mike", sqlite3pp::nocopy);
cmd.bind(":phone", "555-1234", sqlite3pp::nocopy);
cmd.execute();
expect_eq(0, cmd.execute());

sqlite3pp::query qry(db, "SELECT name, phone FROM contacts");
auto iter = qry.begin();
Expand All @@ -114,7 +114,7 @@ void test_insert_bind3() {

void test_query_columns() {
auto db = contacts_db();
db.execute("INSERT INTO contacts (name, phone) VALUES ('Mike', '555-1234')");
expect_eq(0, db.execute("INSERT INTO contacts (name, phone) VALUES ('Mike', '555-1234')"));

sqlite3pp::query qry(db, "SELECT id, name, phone FROM contacts");
expect_eq(3, qry.column_count());
Expand All @@ -125,7 +125,7 @@ void test_query_columns() {

void test_query_get() {
auto db = contacts_db();
db.execute("INSERT INTO contacts (name, phone) VALUES ('Mike', '555-1234')");
expect_eq(0, db.execute("INSERT INTO contacts (name, phone) VALUES ('Mike', '555-1234')"));

sqlite3pp::query qry(db, "SELECT id, name, phone FROM contacts");
auto iter = qry.begin();
Expand All @@ -135,7 +135,7 @@ void test_query_get() {

void test_query_tie() {
auto db = contacts_db();
db.execute("INSERT INTO contacts (name, phone) VALUES ('Mike', '555-1234')");
expect_eq(0, db.execute("INSERT INTO contacts (name, phone) VALUES ('Mike', '555-1234')"));

sqlite3pp::query qry(db, "SELECT id, name, phone FROM contacts");
auto iter = qry.begin();
Expand All @@ -147,7 +147,7 @@ void test_query_tie() {

void test_query_getter() {
auto db = contacts_db();
db.execute("INSERT INTO contacts (name, phone) VALUES ('Mike', '555-1234')");
expect_eq(0, db.execute("INSERT INTO contacts (name, phone) VALUES ('Mike', '555-1234')"));

sqlite3pp::query qry(db, "SELECT id, name, phone FROM contacts");
auto iter = qry.begin();
Expand All @@ -159,7 +159,7 @@ void test_query_getter() {

void test_query_iterator() {
auto db = contacts_db();
db.execute("INSERT INTO contacts (name, phone) VALUES ('Mike', '555-1234')");
expect_eq(0, db.execute("INSERT INTO contacts (name, phone) VALUES ('Mike', '555-1234')"));

sqlite3pp::query qry(db, "SELECT id, name, phone FROM contacts");
for (auto row : qry) {
Expand All @@ -173,7 +173,7 @@ void test_query_iterator() {
void test_function() {
auto db = contacts_db();
sqlite3pp::ext::function func(db);
func.create<int ()>("test_fn", []{return 100;});
expect_eq(0, func.create<int ()>("test_fn", []{return 100;}));

sqlite3pp::query qry(db, "SELECT test_fn()");
auto iter = qry.begin();
Expand All @@ -186,7 +186,7 @@ void test_function_args() {
sqlite3pp::ext::function func(db);
func.create<string (string)>("test_fn", [](const string& name){return "Hello " + name;});

db.execute("INSERT INTO contacts (name, phone) VALUES ('Mike', '555-1234')");
expect_eq(0, db.execute("INSERT INTO contacts (name, phone) VALUES ('Mike', '555-1234')"));

sqlite3pp::query qry(db, "SELECT name, test_fn(name) FROM contacts");
auto iter = qry.begin();
Expand All @@ -212,8 +212,8 @@ void test_aggregate() {
sqlite3pp::ext::aggregate aggr(db);
aggr.create<strlen_aggr, string>("strlen_aggr");

db.execute("INSERT INTO contacts (name, phone) VALUES ('Mike', '555-1234')");
db.execute("INSERT INTO contacts (name, phone) VALUES ('Janette', '555-4321')");
expect_eq(0, db.execute("INSERT INTO contacts (name, phone) VALUES ('Mike', '555-1234')"));
expect_eq(0, db.execute("INSERT INTO contacts (name, phone) VALUES ('Janette', '555-4321')"));

sqlite3pp::query qry(db, "SELECT strlen_aggr(name), strlen_aggr(phone) FROM contacts");
auto iter = qry.begin();
Expand All @@ -230,6 +230,28 @@ void test_invalid_path() {
expect_true(false);
}

void test_reset() {
auto db = contacts_db();
sqlite3pp::command cmd(db, "INSERT INTO contacts (name, phone) VALUES (:user, :phone)");
cmd.bind(":user", "Mike", sqlite3pp::nocopy);
cmd.bind(":phone", "555-1234", sqlite3pp::nocopy);
expect_eq(0, cmd.execute());

cmd.reset();
cmd.bind(":user", "Janette", sqlite3pp::nocopy);
expect_eq(0, cmd.execute());

sqlite3pp::query qry(db, "SELECT COUNT(*) FROM contacts");
auto iter = qry.begin();
int count = (*iter).get<int>(0);
expect_eq(2, count);

cmd.reset();
cmd.clear_bindings();
cmd.bind(":user", "Dave", sqlite3pp::nocopy);
expect_eq(SQLITE_CONSTRAINT, cmd.execute());
}

int main()
{
test_insert_execute();
Expand All @@ -247,6 +269,7 @@ int main()
test_function_args();
test_aggregate();
test_invalid_path();
test_reset();
}

sqlite3pp::database contacts_db() {
Expand Down

0 comments on commit 2534d35

Please sign in to comment.