From b71ca15a0f9114db38eec23b49d1489a2ff1d0ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Fri, 23 Jun 2017 00:11:07 +0200 Subject: Move a few functions from select_query to query --- src/database/database.cpp | 20 ++++++++++++-------- src/database/query.cpp | 15 ++++++++++++++- src/database/query.hpp | 43 ++++++++++++++++++++++++++++++++++++++++--- src/database/select_query.hpp | 41 ----------------------------------------- 4 files changed, 66 insertions(+), 53 deletions(-) diff --git a/src/database/database.cpp b/src/database/database.cpp index 246cdbc..92f7682 100644 --- a/src/database/database.cpp +++ b/src/database/database.cpp @@ -41,7 +41,8 @@ void Database::open(const std::string& filename) Database::GlobalOptions Database::get_global_options(const std::string& owner) { - auto request = Database::global_options.select().where() << Owner{} << "=" << owner; + auto request = Database::global_options.select(); + request.where() << Owner{} << "=" << owner; Database::GlobalOptions options{Database::global_options.get_name()}; auto result = request.execute(Database::db); @@ -54,7 +55,8 @@ Database::GlobalOptions Database::get_global_options(const std::string& owner) Database::IrcServerOptions Database::get_irc_server_options(const std::string& owner, const std::string& server) { - auto request = Database::irc_server_options.select().where() << Owner{} << "=" << owner << " and " << Server{} << "=" << server; + auto request = Database::irc_server_options.select(); + request.where() << Owner{} << "=" << owner << " and " << Server{} << "=" << server; Database::IrcServerOptions options{Database::irc_server_options.get_name()}; auto result = request.execute(Database::db); @@ -70,9 +72,10 @@ Database::IrcServerOptions Database::get_irc_server_options(const std::string& o Database::IrcChannelOptions Database::get_irc_channel_options(const std::string& owner, const std::string& server, const std::string& channel) { - auto request = Database::irc_channel_options.select().where() << Owner{} << "=" << owner <<\ - " and " << Server{} << "=" << server <<\ - " and " << Channel{} << "=" << channel; + auto request = Database::irc_channel_options.select(); + request.where() << Owner{} << "=" << owner <<\ + " and " << Server{} << "=" << server <<\ + " and " << Channel{} << "=" << channel; Database::IrcChannelOptions options{Database::irc_channel_options.get_name()}; auto result = request.execute(Database::db); if (result.size() == 1) @@ -146,9 +149,10 @@ std::string Database::store_muc_message(const std::string& owner, const std::str std::vector Database::get_muc_logs(const std::string& owner, const std::string& chan_name, const std::string& server, int limit, const std::string& start, const std::string& end) { - auto request = Database::muc_log_lines.select().where() << Database::Owner{} << "=" << owner << \ - " and " << Database::IrcChanName{} << "=" << chan_name << \ - " and " << Database::IrcServerName{} << "=" << server; + auto request = Database::muc_log_lines.select(); + request.where() << Database::Owner{} << "=" << owner << \ + " and " << Database::IrcChanName{} << "=" << chan_name << \ + " and " << Database::IrcServerName{} << "=" << server; if (!start.empty()) { diff --git a/src/database/query.cpp b/src/database/query.cpp index e6cf072..ba63a92 100644 --- a/src/database/query.cpp +++ b/src/database/query.cpp @@ -18,4 +18,17 @@ void actual_add_param(Query& query, const OptionalBool& val) query.params.push_back("1"); else query.params.push_back("-1"); -} \ No newline at end of file +} + +Query& operator<<(Query& query, const char* str) +{ + query.body += str; + return query; +} + +Query& operator<<(Query& query, const std::string& str) +{ + query.body += "?"; + actual_add_param(query, str); + return query; +} diff --git a/src/database/query.hpp b/src/database/query.hpp index d9638f7..f103fe9 100644 --- a/src/database/query.hpp +++ b/src/database/query.hpp @@ -22,16 +22,34 @@ struct Query Statement prepare(sqlite3* db) { - sqlite3_stmt* statement; + sqlite3_stmt* stmt; log_debug(this->body); auto res = sqlite3_prepare(db, this->body.data(), static_cast(this->body.size()) + 1, - &statement, nullptr); + &stmt, nullptr); if (res != SQLITE_OK) { log_error("Error preparing statement: ", sqlite3_errmsg(db)); return nullptr; } - return {statement}; + Statement statement(stmt); + int i = 1; + for (const std::string& param: this->params) + { + if (sqlite3_bind_text(statement.get(), i, param.data(), static_cast(param.size()), SQLITE_TRANSIENT) != SQLITE_OK) + log_debug("Failed to bind ", param, " to param ", i); + else + log_debug("Bound ", param, " to ", i); + i++; + } + + return statement; + } + + void execute(sqlite3* db) + { + auto statement = this->prepare(db); + while (sqlite3_step(statement.get()) != SQLITE_DONE) + ; } }; @@ -51,3 +69,22 @@ void actual_add_param(Query& query, const T& val) void actual_add_param(Query& query, const std::string& val); void actual_add_param(Query& query, const OptionalBool& val); + +template +typename std::enable_if::value, Query&>::type +operator<<(Query& query, const T&) +{ + query.body += T::name; + return query; +} + +Query& operator<<(Query& query, const char* str); +Query& operator<<(Query& query, const std::string& str); +template +typename std::enable_if::value, Query&>::type +operator<<(Query& query, const Integer& i) +{ + query.body += "?"; + actual_add_param(query, i); + return query; +} diff --git a/src/database/select_query.hpp b/src/database/select_query.hpp index 837b064..f4d71af 100644 --- a/src/database/select_query.hpp +++ b/src/database/select_query.hpp @@ -112,16 +112,6 @@ struct SelectQuery: public Query auto execute(sqlite3* db) { auto statement = this->prepare(db); - int i = 1; - for (const std::string& param: this->params) - { - if (sqlite3_bind_text(statement.get(), i, param.data(), static_cast(param.size()), SQLITE_TRANSIENT) != SQLITE_OK) - log_debug("Failed to bind ", param, " to param ", i); - else - log_debug("Bound ", param, " to ", i); - - i++; - } std::vector> rows; while (sqlite3_step(statement.get()) == SQLITE_ROW) { @@ -135,34 +125,3 @@ struct SelectQuery: public Query const std::string table_name; }; -template -typename std::enable_if::value, SelectQuery&>::type -operator<<(SelectQuery& query, const T&) -{ - query.body += T::name; - return query; -} - -template -SelectQuery& operator<<(SelectQuery& query, const char* str) -{ - query.body += str; - return query; -} - -template -SelectQuery& operator<<(SelectQuery& query, const std::string& str) -{ - query.body += "?"; - actual_add_param(query, str); - return query; -} - -template -typename std::enable_if::value, SelectQuery&>::type -operator<<(SelectQuery& query, const Integer& i) -{ - query.body += "?"; - actual_add_param(query, i); - return query; -} -- cgit v1.2.3