From dfb0d7c56ab5d5aa2cb27a9da5e0da1b59079706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20K=C3=BChl?= Date: Wed, 19 Feb 2025 15:46:47 +0100 Subject: [PATCH] removed unused code --- include/matador/orm/session.hpp | 3 --- source/orm/orm/session.cpp | 18 ++---------------- test/backends/SessionTest.cpp | 2 +- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/include/matador/orm/session.hpp b/include/matador/orm/session.hpp index 5cbe78e..ca742d7 100644 --- a/include/matador/orm/session.hpp +++ b/include/matador/orm/session.hpp @@ -111,7 +111,6 @@ public: utils::result drop_table(const std::string &table_name) const; [[nodiscard]] utils::result, utils::error> fetch(const sql::query_context &q) const; -// [[nodiscard]] query_result fetch(const std::string &sql) const; [[nodiscard]] size_t execute(const std::string &sql) const; [[nodiscard]] sql::statement prepare(const sql::query_context& q) const; @@ -123,8 +122,6 @@ public: private: friend class query_select; - // [[nodiscard]] std::unique_ptr fetch(const std::string &sql) const; - static query::fetchable_query build_select_query(entity_query_data &&data); private: diff --git a/source/orm/orm/session.cpp b/source/orm/orm/session.cpp index 8e8f51c..8b9a0a7 100644 --- a/source/orm/orm/session.cpp +++ b/source/orm/orm/session.cpp @@ -62,19 +62,14 @@ utils::result, utils::error> session::fetch(const } // adjust columns from given query for (auto &col : q.prototype) { - if (const auto rit = it->second.find(col.name()); /*col.type() == utils::basic_type::type_unknown && */rit != it->second.end()) { + if (const auto rit = it->second.find(col.name()); rit != it->second.end()) { const_cast(col).type(rit->type()); } } auto res = c->fetch(q); - return utils::ok(sql::query_result{std::move(*res)/*, q.prototype*/}); + return utils::ok(sql::query_result{std::move(*res)}); } -//query_result session::fetch(const std::string &sql) const -//{ -// return query_result(std::unique_ptr()); -//} - size_t session::execute(const std::string &sql) const { auto c = pool_.acquire(); if (!c.valid()) { @@ -115,15 +110,6 @@ const class sql::dialect &session::dialect() const return dialect_; } -// std::unique_ptr session::fetch(const std::string &sql) const -// { -// auto c = pool_.acquire(); -// if (!c.valid()) { -// throw std::logic_error("no database connection available"); -// } -// return c->fetch(sql); -// } - query::fetchable_query session::build_select_query(entity_query_data &&data) { return query::query::select(data.columns) .from(*data.root_table) diff --git a/test/backends/SessionTest.cpp b/test/backends/SessionTest.cpp index 4b15f11..3a9569e 100644 --- a/test/backends/SessionTest.cpp +++ b/test/backends/SessionTest.cpp @@ -30,7 +30,7 @@ TEST_CASE_METHOD(SessionFixture, "Session relation test", "[session][relation]") const auto res = ses.find(2); REQUIRE(res.is_ok()); - auto rf = *res; + const auto& rf = *res; REQUIRE(rf->id == (*f)->id); REQUIRE(rf->pilot_name == (*f)->pilot_name); REQUIRE(rf->plane);