moved parameter_binder from member to parameter to bind, execute and fetch methods

test/orm/backend/test_connection.cpp

@@ -1,4 +1,5 @@
 #include "test_connection.hpp"
+#include "test_statement.hpp"
 #include "test_result_reader.hpp"
 
 #include "matador/sql/query_context.hpp"
@@ -17,25 +18,21 @@ namespace matador::test::orm {
 test_connection::test_connection(const sql::connection_info &info)
 : connection_impl(info) {}
 
-utils::result<void, utils::error> test_connection::open()
-{
+utils::result<void, utils::error> test_connection::open() {
   is_open_ = true;
   return utils::ok<void>();
 }
 
-utils::result<void, utils::error> test_connection::close()
-{
+utils::result<void, utils::error> test_connection::close() {
   is_open_ = false;
   return utils::ok<void>();
 }
 
-utils::result<bool, utils::error> test_connection::is_open() const
-{
+utils::result<bool, utils::error> test_connection::is_open() const {
   return utils::ok(is_open_);
 }
 
-utils::result<bool, utils::error> test_connection::is_valid() const
-{
+utils::result<bool, utils::error> test_connection::is_valid() const {
   return is_open();
 }
 
@@ -47,33 +44,28 @@ utils::result<utils::version, utils::error> test_connection::server_version() co
   return utils::ok(utils::version{3, 2, 1});
 }
 
-utils::result<size_t, utils::error> test_connection::execute(const std::string &/*stmt*/)
-{
+utils::result<size_t, utils::error> test_connection::execute(const std::string &/*stmt*/) {
   return utils::ok(static_cast<size_t>(4));
 }
 
-utils::result<std::unique_ptr<sql::query_result_impl>, utils::error> test_connection::fetch(const sql::query_context &context)
-{
+utils::result<std::unique_ptr<sql::query_result_impl>, utils::error> test_connection::fetch(const sql::query_context &context) {
   return utils::ok(std::make_unique<sql::query_result_impl>(std::make_unique<test_result_reader>(), context.prototype, context.prototype.size()));
 }
 
-utils::result<std::unique_ptr<sql::statement_impl>, utils::error> test_connection::prepare(const sql::query_context &/*context*/)
-{
-  return utils::ok(std::unique_ptr<sql::statement_impl>{});
+utils::result<std::unique_ptr<sql::statement_impl>, utils::error> test_connection::prepare(const sql::query_context &context) {
+  std::unique_ptr<sql::statement_impl> s(std::make_unique<test_statement>(context));
+  return utils::ok(std::move(s));
 }
 
-utils::result<std::vector<object::attribute_definition>, utils::error> test_connection::describe(const std::string &/*table*/)
-{
+utils::result<std::vector<object::attribute_definition>, utils::error> test_connection::describe(const std::string &/*table*/) {
   return utils::ok(std::vector<object::attribute_definition>{});
 }
 
-utils::result<bool, utils::error> test_connection::exists(const std::string &/*schema_name*/, const std::string &/*table_name*/)
-{
+utils::result<bool, utils::error> test_connection::exists(const std::string &/*schema_name*/, const std::string &/*table_name*/) {
   return utils::ok(false);
 }
 
-std::string test_connection::to_escaped_string(const utils::blob& value) const
-{
+std::string test_connection::to_escaped_string(const utils::blob& value) const {
   return utils::to_string(value);
 }
 

test/orm/backend/test_statement.cpp

@@ -1,22 +1,22 @@
 #include "test_statement.hpp"
 #include "test_result_reader.hpp"
+#include "test_parameter_binder.hpp"
 
 namespace matador::test::orm {
 test_statement::test_statement(const sql::query_context &query)
 : statement_impl(query) {}
 
-utils::result<size_t, utils::error> test_statement::execute() {
+utils::result<size_t, utils::error> test_statement::execute(const sql::interface::parameter_binder &/*bindings*/) {
   return utils::ok(static_cast<size_t>(8));
 }
 
-utils::result<std::unique_ptr<sql::query_result_impl>, utils::error> test_statement::fetch() {
+utils::result<std::unique_ptr<sql::query_result_impl>, utils::error> test_statement::fetch(const sql::interface::parameter_binder &/*bindings*/) {
   return utils::ok(std::make_unique<sql::query_result_impl>(std::make_unique<test_result_reader>(), query_.prototype, query_.prototype.size()));
 }
 
 void test_statement::reset() {}
-
-utils::attribute_writer &test_statement::binder() {
-  return binder_;
+std::unique_ptr<utils::attribute_writer> test_statement::create_binder() const {
+  return std::make_unique<test_parameter_binder>();
 }
 
 } // namespace matador::test::orm

test/orm/backend/test_statement.hpp

@@ -1,8 +1,6 @@
 #ifndef TEST_STATEMENT_HPP
 #define TEST_STATEMENT_HPP
 
-#include "test_parameter_binder.hpp"
-
 #include "matador/sql/interface/statement_impl.hpp"
 
 namespace matador::test::orm {
@@ -10,15 +8,12 @@ namespace matador::test::orm {
 class test_statement final : public sql::statement_impl {
 public:
   explicit test_statement(const sql::query_context &query);
-  utils::result<size_t, utils::error> execute() override;
-  utils::result<std::unique_ptr<sql::query_result_impl>, utils::error> fetch() override;
+  utils::result<size_t, utils::error> execute(const sql::interface::parameter_binder &bindings) override;
+  utils::result<std::unique_ptr<sql::query_result_impl>, utils::error> fetch(const sql::interface::parameter_binder &bindings) override;
   void reset() override;
 
 protected:
-  utils::attribute_writer &binder() override;
-
-private:
-  test_parameter_binder binder_;
+  [[nodiscard]] std::unique_ptr<utils::attribute_writer> create_binder() const override;
 };
 
 }