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

session queries as statement progress

This commit is contained in:
Sascha Kühl 2025-10-06 07:31:16 +02:00
parent 5490e67ecf
commit 4fd9a74ae8
10 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/matador/object/foreign_node_completer.hpp
View File

@ -101,12 +101,12 @@ void foreign_node_completer::on_has_many( const char* /*id*/, CollectionType&, c
}
template<class CollectionType>
void foreign_node_completer::on_has_many_to_many( const char* id, CollectionType& /*collection*/, const char* /*join_column*/, const char* /*inverse_join_column*/, const utils::foreign_attributes& /*attr*/ ) {
void foreign_node_completer::on_has_many_to_many( const char* /*id*/, CollectionType& /*collection*/, const char* /*join_column*/, const char* /*inverse_join_column*/, const utils::foreign_attributes& /*attr*/ ) {
attach_node<typename CollectionType::value_type::value_type>(/*id*/);
}
template<class CollectionType>
void foreign_node_completer::on_has_many_to_many( const char* id, CollectionType& /*collection*/, const utils::foreign_attributes& /*attr*/ ) {
void foreign_node_completer::on_has_many_to_many( const char* /*id*/, CollectionType& /*collection*/, const utils::foreign_attributes& /*attr*/ ) {
attach_node<typename CollectionType::value_type::value_type>(/*id*/);
}

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

@ -121,15 +121,17 @@ public:
return utils::failure(make_error(error_code::FailedToBuildQuery, "Failed to build query for type " + info->get().name() + "."));
}
auto obj = build_select_query(data.release()).template fetch_one<Type>(*this);
auto res = build_select_query(data.release()).prepare(*this);
// auto obj = build_select_query(data.release()).template fetch_one<Type>(*this);
if (!obj) {
return utils::failure(obj.err());
if (!res) {
return utils::failure(res.err());
}
if (!obj->get()) {
auto stmt_result = res->bind(0, const_cast<PrimaryKeyType&>(pk)).template fetch_one<Type>();
if (!stmt_result) {
return utils::failure(make_error(error_code::FailedToFindObject, "Failed to find object of type " + info->get().name() + " with primary key " + std::to_string(pk) + "."));
}
return utils::ok(object::object_ptr<Type>{ obj->release() });
return utils::ok(object::object_ptr<Type>{ stmt_result->release() });
}
template<typename Type>

4
include/matador/orm/session_query_builder.hpp
View File

@ -88,9 +88,9 @@ public:
if (pk_.is_null()) {
entity_query_data_.pk_column_name = id;
} else if (pk_.is_integer()) {
auto v = *pk_.as<V>();
// auto v = *pk_.as<V>();
auto c = sql::column{table_info_stack_.top().table, id, ""};
auto co = std::make_unique<query::condition<sql::column, V>>(c, query::basic_condition::operand_type::EQUAL, v);
auto co = std::make_unique<query::condition<sql::column, utils::placeholder>>(c, query::basic_condition::operand_type::EQUAL, utils::_);
entity_query_data_.where_clause = std::move(co);
entity_query_data_.pk_column_name = id;
} else if (pk_.is_varchar()) {

3
include/matador/sql/connection.hpp
View File

@ -25,7 +25,7 @@ public:
* @param info The database connection info data
* @param sql_logger The logging handler
*/
explicit connection(connection_info info, const logger_ptr &sql_logger = null_logger);
explicit connection(const connection_info& info, const logger_ptr &sql_logger = null_logger);
/**
* @brief Creates a database connection from a connection string.
*
@ -147,7 +147,6 @@ private:
friend class session;
friend class statement_cache;
connection_info connection_info_;
std::unique_ptr<connection_impl> connection_;
std::shared_ptr<abstract_sql_logger> logger_ = std::make_shared<null_sql_logger>();
};

5
include/matador/sql/interface/connection_impl.hpp
View File

@ -42,14 +42,13 @@ public:
[[nodiscard]] const class dialect &dialect() const;
[[nodiscard]] virtual std::string to_escaped_string(const utils::blob &value) const = 0;
[[nodiscard]] const connection_info &info() const;
protected:
explicit connection_impl(const connection_info &info);
[[nodiscard]] const connection_info &info() const;
private:
std::reference_wrapper<const connection_info> info_;
connection_info info_;
std::reference_wrapper<const class dialect> dialect_;
};

2
include/matador/sql/query_result.hpp
View File

@ -139,7 +139,7 @@ public:
, creator_(std::move(creator)) {}
iterator begin() { return std::move(++iterator(this)); }
static iterator end() { return {}; }
iterator end() { return {}; }
private:
friend class query_result_iterator<Type>;

6
source/orm/sql/column_generator.cpp
View File

@ -18,15 +18,15 @@ column_generator::column_generator(std::vector<column> &column_infos,
seen_tables.insert(table_name);
}
std::vector<column> column_generator::generate( const object::repository& scm, const std::string& name, bool force_lazy ) {
std::vector<column> column_generator::generate( const object::repository& scm, const std::string& name, bool /*force_lazy*/ ) {
const auto info = scm.basic_info(name);
if (!info) {
return {};
}
std::vector<column> columns;
for (const auto attr : info.value().get().definition()) {
columns.push_back(column{attr.name()});
for (const auto& attr : info.value().get().definition()) {
columns.emplace_back(attr.name());
}
return columns;
}

23
source/orm/sql/connection.cpp
View File

@ -28,20 +28,17 @@ public:
};
}
connection::connection(connection_info info, const std::shared_ptr<abstract_sql_logger> &sql_logger)
: connection_info_(std::move(info))
, logger_(sql_logger)
connection::connection(const connection_info& info, const std::shared_ptr<abstract_sql_logger> &sql_logger)
: logger_(sql_logger)
{
connection_.reset(backend_provider::instance().create_connection(connection_info_.type, connection_info_));
connection_.reset(backend_provider::instance().create_connection(info.type, info));
}
connection::connection(const std::string& dns, const std::shared_ptr<abstract_sql_logger> &sql_logger)
: connection(connection_info::parse(dns), sql_logger)
{}
connection::connection(const connection &x)
: connection_info_(x.connection_info_)
{
connection::connection(const connection &x) {
if (x.connection_) {
throw std::runtime_error("couldn't copy connection with valid connection impl");
}
@ -52,7 +49,6 @@ connection &connection::operator=(const connection &x) {
return *this;
}
connection_info_ = x.connection_info_;
if (x.connection_) {
throw std::runtime_error("couldn't copy connection with valid connection impl");
}
@ -60,13 +56,11 @@ connection &connection::operator=(const connection &x) {
}
connection::connection( connection&& x ) noexcept
: connection_info_(std::move(x.connection_info_))
, connection_(std::move(x.connection_))
: connection_(std::move(x.connection_))
, logger_(std::move(x.logger_))
{}
connection & connection::operator=(connection &&x) noexcept {
connection_info_ = std::move(x.connection_info_);
connection_ = std::move(x.connection_);
logger_ = std::move(x.logger_);
@ -80,7 +74,8 @@ connection::~connection() {
if (connection_->is_open()) {
connection_->close();
}
backend_provider::instance().destroy_connection(connection_info_.type, connection_.release());
connection_impl* impl = connection_.release();
backend_provider::instance().destroy_connection(impl->info().type, impl);
connection_ = nullptr;
}
@ -108,11 +103,11 @@ utils::result<bool, utils::error> connection::is_open() const
const connection_info &connection::info() const
{
return connection_info_;
return connection_->info();
}
std::string connection::type() const {
return connection_info_.type;
return connection_->info().type;
}
utils::result<void, utils::error> connection::begin() const {

10
source/orm/sql/connection_pool.cpp
View File

@ -58,12 +58,12 @@ connection_pool::connection_pool(const std::string& dns, size_t count)
: info_(connection_info::parse(dns)) {
connection_repo_.reserve(count);
while (count) {
connection c(info_);
auto&& cc = std::move(c);
const auto ic = identifiable_connection{count, std::move(cc)};
connection_repo_.push_back(ic);
// connection c(info_);
// auto&& cc = std::move(c);
// const auto ic = identifiable_connection{count, std::move(cc)};
// connection_repo_.push_back(ic);
// connection_repo_.emplace_back(count, std::move(cc));
// connection_repo_.emplace_back(count, connection{info_});
connection_repo_.emplace_back(count, connection{info_});
auto &conn = connection_repo_.back();
idle_connections_.emplace(conn.id, &conn);
// Todo: handle result

1
test/backends/SessionTest.cpp
View File

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