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

renamed query::entity_query_data to query::select_query_data

This commit is contained in:
Sascha Kühl 2026-02-07 10:37:03 +01:00
parent c0e0499204
commit a498efd21d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,7 +147,7 @@ public:
private: private:
friend class query_select; friend class query_select;
static query::fetchable_query build_select_query(query::entity_query_data &&data); static query::fetchable_query build_select_query(query::select_query_data &&data);
private: private:
sql::connection_pool pool_; sql::connection_pool pool_;

6
include/matador/query/select_query_builder.hpp
View File

@ -21,7 +21,7 @@
namespace matador::query { namespace matador::query {
struct entity_query_data { struct select_query_data {
const table* root_table{nullptr}; const table* root_table{nullptr};
std::string pk_column_name{}; std::string pk_column_name{};
std::vector<table_column> columns{}; std::vector<table_column> columns{};
@ -58,7 +58,7 @@ public:
, executor_(exec){} , executor_(exec){}
template<class EntityType> template<class EntityType>
utils::result<entity_query_data, query_build_error> build(criteria_ptr clause = {}) { utils::result<select_query_data, query_build_error> build(criteria_ptr clause = {}) {
const auto it = schema_.find(typeid(EntityType)); const auto it = schema_.find(typeid(EntityType));
if (it == schema_.end()) { if (it == schema_.end()) {
return utils::failure(query_build_error::UnknownType); return utils::failure(query_build_error::UnknownType);
@ -260,7 +260,7 @@ private:
std::stack<table_info> table_info_stack_{}; std::stack<table_info> table_info_stack_{};
std::unordered_map<std::string, table> processed_tables_{}; std::unordered_map<std::string, table> processed_tables_{};
const basic_schema &schema_; const basic_schema &schema_;
entity_query_data entity_query_data_{}; select_query_data entity_query_data_{};
unsigned int column_index{0}; unsigned int column_index{0};
unsigned int table_index{0}; unsigned int table_index{0};
object::join_columns_collector join_columns_collector_{}; object::join_columns_collector join_columns_collector_{};

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

@ -120,7 +120,7 @@ std::string session::str(const sql::query_context& ctx) const {
return ctx.sql; return ctx.sql;
} }
query::fetchable_query session::build_select_query(query::entity_query_data &&data) { query::fetchable_query session::build_select_query(query::select_query_data &&data) {
return query::query::select(data.columns) return query::query::select(data.columns)
.from(*data.root_table) .from(*data.root_table)
.join_left(data.joins) .join_left(data.joins)