implemented lazy loading for object_ptr and belongs_to

test/orm/backend/test_connection.cpp

@@ -49,7 +49,10 @@ utils::result<size_t, utils::error> test_connection::execute(const std::string &
 }
 
 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()));
+  return utils::ok(std::make_unique<sql::query_result_impl>(std::make_unique<test_result_reader>(),
+                                                            context.prototype,
+                                                            context.resolver_factory,
+                                                            context.prototype.size()));
 }
 
 utils::result<std::unique_ptr<sql::statement_impl>, utils::error> test_connection::prepare(const sql::query_context &context) {
@@ -61,12 +64,12 @@ utils::result<std::vector<object::attribute>, utils::error> test_connection::des
   return utils::ok(std::vector<object::attribute>{});
 }
 
-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_type_t& value) const {
+std::string test_connection::to_escaped_string(const utils::blob_type_t &value) const {
   return utils::to_string(value);
 }
-
-}
+}

test/orm/backend/test_statement.cpp

@@ -19,7 +19,10 @@ utils::result<size_t, utils::error> test_statement::execute(const sql::parameter
 }
 
 utils::result<std::unique_ptr<sql::query_result_impl>, utils::error> test_statement::fetch(const sql::parameter_binder &/*bindings*/) {
-  return utils::ok(std::make_unique<sql::query_result_impl>(std::make_unique<test_result_reader>(), query_.prototype, query_.prototype.size()));
+  return utils::ok(std::make_unique<sql::query_result_impl>(std::make_unique<test_result_reader>(),
+    query_.prototype,
+    query_.resolver_factory,
+    query_.prototype.size()));
 }
 
 void test_statement::reset() {}

test/orm/orm/SessionQueryBuilderTest.cpp

@@ -12,11 +12,8 @@
 #include "matador/query/table.hpp"
 #include "matador/query/schema.hpp"
 
-#include "matador/utils/macro_map.hpp"
+#include "matador/query/query_builder.hpp"
 
-#include "matador/orm/session_query_builder.hpp"
-
-#include "../backend/test_connection.hpp"
 #include "../backend/test_backend_service.hpp"
 
 #include "../../models/airplane.hpp"
@@ -29,7 +26,6 @@
 #include "../../models/student.hpp"
 
 using namespace matador::object;
-using namespace matador::orm;
 using namespace matador::query;
 using namespace matador::utils;
 using namespace matador::sql;
@@ -46,7 +42,7 @@ TEST_CASE("Create sql query data for entity with eager has one", "[query][entity
     .and_then( [&scm] { return scm.attach<flight>("flights"); } );
   REQUIRE(result);
 
-  session_query_builder eqb(scm, db);
+  query_builder eqb(scm, db);
 
   const auto it = scm.find(typeid(flight));
   REQUIRE(it != scm.end());
@@ -100,7 +96,7 @@ TEST_CASE("Create sql query data for entity with eager belongs to", "[query][ent
     .and_then( [&scm] { return scm.attach<book>("books"); } );
   REQUIRE(result);
 
-  session_query_builder eqb(scm, db);
+  query_builder eqb(scm, db);
 
   const auto it = scm.find(typeid(book));
   REQUIRE(it != scm.end());
@@ -172,7 +168,7 @@ TEST_CASE("Create sql query data for entity with eager has many belongs to", "[q
     .and_then( [&scm] { return scm.attach<order>("orders"); } );
   REQUIRE(result);
 
-  session_query_builder eqb(scm, db);
+  query_builder eqb(scm, db);
 
   const auto it = scm.find(typeid(order));
   REQUIRE(it != scm.end());
@@ -236,7 +232,7 @@ TEST_CASE("Create sql query data for entity with eager many to many", "[query][e
     .and_then( [&scm] { return scm.attach<ingredient>("ingredients"); } );
   REQUIRE(result);
 
-  session_query_builder eqb(scm, db);
+  query_builder eqb(scm, db);
 
   const auto it = scm.find(typeid(ingredient));
   REQUIRE(it != scm.end());
@@ -290,7 +286,7 @@ TEST_CASE("Create sql query data for entity with eager many to many (inverse par
     .and_then( [&scm] { return scm.attach<course>("courses"); } );
   REQUIRE(result);
 
-  session_query_builder eqb(scm, db);
+  query_builder eqb(scm, db);
 
   const auto it = scm.find(typeid(course));
   REQUIRE(it != scm.end());
@@ -344,7 +340,7 @@ TEST_CASE("Test eager relationship", "[session][eager]") {
     .and_then( [&scm] { return scm.attach<employee>("employees"); } );
   REQUIRE(result);
 
-  session_query_builder eqb(scm, db);
+  query_builder eqb(scm, db);
 
   auto data = eqb.build<department>();
   REQUIRE(data.is_ok());