From dfd31cdf357c4b7c1b99f29f2c361a141c9e01bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20K=C3=BChl?= Date: Wed, 7 Jan 2026 09:09:17 +0100 Subject: [PATCH] moved dump schema method to class schema --- include/matador/orm/session.hpp | 2 -- include/matador/query/schema.hpp | 2 ++ source/orm/orm/session.cpp | 4 ---- source/orm/query/schema.cpp | 7 +++++++ 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/include/matador/orm/session.hpp b/include/matador/orm/session.hpp index d70f72c..4d434fd 100644 --- a/include/matador/orm/session.hpp +++ b/include/matador/orm/session.hpp @@ -118,8 +118,6 @@ public: [[nodiscard]] std::vector describe_table(const std::string &table_name) const; [[nodiscard]] bool table_exists(const std::string &table_name) const; - void dump_schema(std::ostream &os) const; - [[nodiscard]] utils::result, utils::error> fetch(const sql::query_context &ctx) const override; [[nodiscard]] utils::result execute(const sql::query_context &ctx) const override; [[nodiscard]] utils::result prepare(const sql::query_context &ctx) override; diff --git a/include/matador/query/schema.hpp b/include/matador/query/schema.hpp index 10a65a9..bb3c194 100644 --- a/include/matador/query/schema.hpp +++ b/include/matador/query/schema.hpp @@ -111,6 +111,8 @@ public: const object::repository &repo() const { return repo_; } object::repository &repo() { return repo_; } + void dump(std::ostream &os) const; + private: [[nodiscard]] sql::query_context build_add_constraint_context(const object::repository_node& node, const object::restriction& cons, const sql::connection &conn) const; [[nodiscard]] sql::query_context build_drop_constraint_context(const object::repository_node& node, const object::restriction& cons, const sql::connection &conn) const; diff --git a/source/orm/orm/session.cpp b/source/orm/orm/session.cpp index b093a6a..7798094 100644 --- a/source/orm/orm/session.cpp +++ b/source/orm/orm/session.cpp @@ -84,10 +84,6 @@ const class sql::dialect &session::dialect() const { return dialect_; } -void session::dump_schema(std::ostream &os) const { - schema_.repo().dump(os); -} - utils::result, utils::error> session::fetch(const sql::query_context& ctx) const { if (const auto result = cache_.acquire(ctx); !result) { return utils::failure(result.err()); diff --git a/source/orm/query/schema.cpp b/source/orm/query/schema.cpp index 4c984a4..22ee337 100644 --- a/source/orm/query/schema.cpp +++ b/source/orm/query/schema.cpp @@ -218,6 +218,13 @@ schema::const_iterator schema::find(const std::string &name) const { return schema_nodes_.find(result->get().type_index()); } +void schema::dump(std::ostream &os) const { + os << repo_.name() << std::endl; + for (const auto &node: repo_) { + os << " " << node.name() << std::endl; + } +} + sql::query_context schema::build_add_constraint_context(const object::repository_node &node, const object::restriction &cons, const sql::connection &conn) const {