sascha
/
query
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

removed unused code

This commit is contained in:
Sascha Kühl 2025-02-19 15:46:47 +01:00
parent 8ab8274d93
commit dfb0d7c56a
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/matador/orm/session.hpp
View File

@ -111,7 +111,6 @@ public:
utils::result<void, utils::error> drop_table(const std::string &table_name) const; utils::result<void, utils::error> drop_table(const std::string &table_name) const;
[[nodiscard]] utils::result<sql::query_result<sql::record>, utils::error> fetch(const sql::query_context &q) const; [[nodiscard]] utils::result<sql::query_result<sql::record>, utils::error> fetch(const sql::query_context &q) const;
// [[nodiscard]] query_result<record> fetch(const std::string &sql) const;
[[nodiscard]] size_t execute(const std::string &sql) const; [[nodiscard]] size_t execute(const std::string &sql) const;
[[nodiscard]] sql::statement prepare(const sql::query_context& q) const; [[nodiscard]] sql::statement prepare(const sql::query_context& q) const;
@ -123,8 +122,6 @@ public:
private: private:
friend class query_select; friend class query_select;
// [[nodiscard]] std::unique_ptr<sql::query_result_impl> fetch(const std::string &sql) const;
static query::fetchable_query build_select_query(entity_query_data &&data); static query::fetchable_query build_select_query(entity_query_data &&data);
private: private:

18
source/orm/orm/session.cpp
View File

@ -62,19 +62,14 @@ utils::result<sql::query_result<sql::record>, utils::error> session::fetch(const
} }
// adjust columns from given query // adjust columns from given query
for (auto &col : q.prototype) { 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<object::attribute_definition&>(col).type(rit->type()); const_cast<object::attribute_definition&>(col).type(rit->type());
} }
} }
auto res = c->fetch(q); auto res = c->fetch(q);
return utils::ok(sql::query_result<sql::record>{std::move(*res)/*, q.prototype*/}); return utils::ok(sql::query_result<sql::record>{std::move(*res)});
} }
//query_result<record> session::fetch(const std::string &sql) const
//{
// return query_result<record>(std::unique_ptr());
//}
size_t session::execute(const std::string &sql) const { size_t session::execute(const std::string &sql) const {
auto c = pool_.acquire(); auto c = pool_.acquire();
if (!c.valid()) { if (!c.valid()) {
@ -115,15 +110,6 @@ const class sql::dialect &session::dialect() const
return dialect_; return dialect_;
} }
// std::unique_ptr<sql::query_result_impl> 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) { query::fetchable_query session::build_select_query(entity_query_data &&data) {
return query::query::select(data.columns) return query::query::select(data.columns)
.from(*data.root_table) .from(*data.root_table)

2
test/backends/SessionTest.cpp
View File

@ -30,7 +30,7 @@ TEST_CASE_METHOD(SessionFixture, "Session relation test", "[session][relation]")
const auto res = ses.find<flight>(2); const auto res = ses.find<flight>(2);
REQUIRE(res.is_ok()); REQUIRE(res.is_ok());
auto rf = *res; const auto& rf = *res;
REQUIRE(rf->id == (*f)->id); REQUIRE(rf->id == (*f)->id);
REQUIRE(rf->pilot_name == (*f)->pilot_name); REQUIRE(rf->pilot_name == (*f)->pilot_name);
REQUIRE(rf->plane); REQUIRE(rf->plane);