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

introduced execute_result

Browse Source
This commit is contained in:
Sascha Kühl
2026-02-10 11:57:09 +01:00
parent d9f9712487
commit 99677b0e21
28 changed files with 158 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/orm/CMakeLists.txt
+1
View File
@@ -76,6 +76,7 @@ add_library(matador-orm STATIC
../../include/matador/sql/dialect_builder.hpp
../../include/matador/sql/dialect_token.hpp
../../include/matador/sql/error_code.hpp
../../include/matador/sql/execute_result.hpp
../../include/matador/sql/executor.hpp
../../include/matador/sql/field.hpp
../../include/matador/sql/interface/connection_impl.hpp
source/orm/orm/session.cpp
+2 -2
View File
@@ -60,7 +60,7 @@ utils::result<sql::query_result<sql::record>, utils::error> session::fetch_all(c
return utils::ok(sql::query_result<sql::record>{std::move(*res), prototype});
}
utils::result<size_t, utils::error> session::execute(const std::string &sql) const {
utils::result<sql::execute_result, utils::error> session::execute(const std::string &sql) const {
return execute(sql::query_context{sql});
}
@@ -102,7 +102,7 @@ utils::result<std::unique_ptr<sql::query_result_impl>, utils::error> session::fe
}
}
utils::result<size_t, utils::error> session::execute(const sql::query_context& ctx) const {
utils::result<sql::execute_result, utils::error> session::execute(const sql::query_context& ctx) const {
if (const auto result = cache_.acquire(ctx); !result) {
return utils::failure(result.err());
} else if (auto exec_result = result->execute(); !exec_result) {
source/orm/query/intermediates/executable_query.cpp
+2 -1
View File
@@ -1,12 +1,13 @@
#include "matador/query/intermediates/executable_query.hpp"
#include "matador/query/query_builder.hpp"
#include "matador/sql/execute_result.hpp"
#include "matador/sql/executor.hpp"
#include "matador/sql/statement.hpp"
namespace matador::query {
utils::result<size_t, utils::error> executable_query::execute(const sql::executor &exec) const {
utils::result<sql::execute_result, utils::error> executable_query::execute(const sql::executor &exec) const {
query_builder compiler;
return exec.execute(compiler.compile(*context_, exec.dialect(), std::nullopt));
}
source/orm/query/schema.cpp
+6 -6
View File
@@ -56,7 +56,7 @@ utils::result<void, utils::error> schema::create(const sql::connection &conn) co
.compile(conn);
std::cout << ctx.sql << std::endl;
if (auto result = conn.execute(ctx.sql); !result) {
if (auto result = conn.execute(ctx); !result) {
return utils::failure(result.err());
}
}
@@ -70,7 +70,7 @@ utils::result<void, utils::error> schema::create(const sql::connection &conn) co
auto ctx = build_add_constraint_context(node, cons, conn);
std::cout << ctx.sql << std::endl;
if (auto result = conn.execute(ctx.sql); !result) {
if (auto result = conn.execute(ctx); !result) {
return utils::failure(result.err());
}
}
@@ -84,7 +84,7 @@ utils::result<void, utils::error> schema::create(const sql::connection &conn) co
auto ctx = build_add_constraint_context(node, cons, conn);
std::cout << ctx.sql << std::endl;
if (auto result = conn.execute(ctx.sql); !result) {
if (auto result = conn.execute(ctx); !result) {
return utils::failure(result.err());
}
}
@@ -105,7 +105,7 @@ utils::result<void, utils::error> schema::drop(const sql::connection &conn) cons
.compile(conn);
std::cout << ctx.sql << std::endl;
if (auto result = conn.execute(ctx.sql); !result) {
if (auto result = conn.execute(ctx); !result) {
return utils::failure(result.err());
}
}
@@ -123,7 +123,7 @@ utils::result<void, utils::error> schema::drop(const sql::connection &conn) cons
.compile(conn);
std::cout << ctx.sql << std::endl;
if (auto result = conn.execute(ctx.sql); !result) {
if (auto result = conn.execute(ctx); !result) {
return utils::failure(result.err());
}
}
@@ -136,7 +136,7 @@ utils::result<void, utils::error> schema::drop(const sql::connection &conn) cons
.compile(conn);
std::cout << ctx.sql << std::endl;
if (auto result = conn.execute(ctx.sql); !result) {
if (auto result = conn.execute(ctx); !result) {
return utils::failure(result.err());
}
}
source/orm/sql/connection.cpp
+5 -36
View File
@@ -18,7 +18,7 @@ public:
explicit connection_statement_proxy(std::unique_ptr<statement_impl>&& stmt)
: statement_proxy(std::move(stmt)) {}
utils::result<size_t, utils::error> execute(parameter_binder& bindings) override {
utils::result<execute_result, utils::error> execute(parameter_binder& bindings) override {
return statement_->execute(bindings);
}
utils::result<std::unique_ptr<query_result_impl>, utils::error> fetch(parameter_binder& bindings) override {
@@ -163,53 +163,22 @@ utils::result<bool, utils::error> connection::exists(const std::string &table_na
return connection_->exists(dialect().default_schema_name(), table_name);
}
utils::result<size_t, utils::error> connection::execute(const std::string &sql) const {
logger_->on_execute(sql);
std::cout << sql << std::endl;
return connection_->execute(sql);
}
bool has_unknown_columns(const std::vector<object::attribute> &columns) {
return std::any_of(std::begin(columns), std::end(columns), [](const auto &col) {
return col.type() == utils::basic_type::Null;
});
}
// query_result<record> connection::fetch(const query_context &ctx) const
// {
// if (ctx.prototype.empty() || is_unknown(ctx.prototype)) {
// const auto table_prototype = describe(ctx.table.name);
// for (auto &col : ctx.prototype) {
// const auto rit = std::find_if(std::begin(table_prototype), std::end(table_prototype), [&col](const auto &value) {
// return value.name() == col.name();
// });
// if (col.type() == data_type::type_unknown && rit != table_prototype.end()) {
// const_cast<column_definition&>(col).type(rit->type());
// }
// }
// }
// // auto it = prototypes_.find(q.table_name);
// // if (it == prototypes_.end()) {
// // it = prototypes_.emplace(q.table_name, describe(q.table_name)).first;
// // }
// // // adjust columns from given query
// // for (auto &col : q.prototype) {
// // if (const auto rit = it->second.find(col.name()); col.type() == data_type_t::type_unknown && rit != it->second.end()) {
// // const_cast<column&>(col).type(rit->type());
// // }
// // }
// auto res = fetch(ctx.sql);
// return query_result<record>{std::move(res), ctx.prototype};
// }
utils::result<std::unique_ptr<query_result_impl>, utils::error> connection::fetch(const query_context &ctx) const {
logger_->on_fetch(ctx.sql);
std::cout << ctx.sql << std::endl;
return connection_->fetch(ctx);
}
utils::result<size_t, utils::error> connection::execute(const query_context& ctx) const {
return execute(ctx.sql);
utils::result<execute_result, utils::error> connection::execute(const query_context& ctx) const {
logger_->on_execute(ctx.sql);
std::cout << ctx.sql << std::endl;
return connection_->execute(ctx.sql);
}
utils::result<statement, utils::error> connection::prepare(const query_context &ctx) {
source/orm/sql/statement.cpp
+2 -1
View File
@@ -1,4 +1,5 @@
#include "matador/sql/statement.hpp"
#include "matador/sql/execute_result.hpp"
#include "matador/sql/record.hpp"
#include <algorithm>
@@ -49,7 +50,7 @@ statement &statement::bind(const size_t pos, std::string &val, const size_t size
return *this;
}
utils::result<size_t, utils::error> statement::execute() const {
utils::result<execute_result, utils::error> statement::execute() const {
logger_->on_execute(statement_proxy_->sql());
std::cout << statement_proxy_->sql() << std::endl;
return statement_proxy_->execute(*bindings_);
source/orm/sql/statement_cache.cpp
+2 -2
View File
@@ -31,10 +31,10 @@ public:
, connection_id_(connection_id)
, bus_(bus) {}
utils::result<size_t, utils::error> execute(parameter_binder& bindings) override {
utils::result<execute_result, utils::error> execute(parameter_binder& bindings) override {
execution_metrics metrics{std::chrono::steady_clock::now()};
auto result = try_with_retry([this, &bindings, &metrics]() -> utils::result<size_t, utils::error> {
auto result = try_with_retry([this, &bindings, &metrics]() -> utils::result<execute_result, utils::error> {
const auto query = sql();
if (!try_lock()) {
++metrics.lock_attempts;