From a498efd21dc7bd24f1d5ad876fae8d1054d0d8d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20K=C3=BChl?= Date: Sat, 7 Feb 2026 10:37:03 +0100 Subject: [PATCH] renamed query::entity_query_data to query::select_query_data --- include/matador/orm/session.hpp | 2 +- include/matador/query/select_query_builder.hpp | 6 +++--- source/orm/orm/session.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/matador/orm/session.hpp b/include/matador/orm/session.hpp index 73835ce..b29d4bf 100644 --- a/include/matador/orm/session.hpp +++ b/include/matador/orm/session.hpp @@ -147,7 +147,7 @@ public: private: 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: sql::connection_pool pool_; diff --git a/include/matador/query/select_query_builder.hpp b/include/matador/query/select_query_builder.hpp index 9487b55..9817e37 100644 --- a/include/matador/query/select_query_builder.hpp +++ b/include/matador/query/select_query_builder.hpp @@ -21,7 +21,7 @@ namespace matador::query { -struct entity_query_data { +struct select_query_data { const table* root_table{nullptr}; std::string pk_column_name{}; std::vector columns{}; @@ -58,7 +58,7 @@ public: , executor_(exec){} template - utils::result build(criteria_ptr clause = {}) { + utils::result build(criteria_ptr clause = {}) { const auto it = schema_.find(typeid(EntityType)); if (it == schema_.end()) { return utils::failure(query_build_error::UnknownType); @@ -260,7 +260,7 @@ private: std::stack table_info_stack_{}; std::unordered_map processed_tables_{}; const basic_schema &schema_; - entity_query_data entity_query_data_{}; + select_query_data entity_query_data_{}; unsigned int column_index{0}; unsigned int table_index{0}; object::join_columns_collector join_columns_collector_{}; diff --git a/source/orm/orm/session.cpp b/source/orm/orm/session.cpp index bf76bc0..e759334 100644 --- a/source/orm/orm/session.cpp +++ b/source/orm/orm/session.cpp @@ -120,7 +120,7 @@ std::string session::str(const sql::query_context& ctx) const { 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) .from(*data.root_table) .join_left(data.joins)