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

attaching schema nodes progress

This commit is contained in:
Sascha Kühl 2025-07-10 16:02:25 +02:00
parent 7fd11ad174
commit 6982eebfd6
7 changed files with 61 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backends/postgres/test/CMakeLists.txt
View File

@ -2,7 +2,8 @@ CPMAddPackage("gh:catchorg/Catch2@3.7.1")
list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
set(POSTGRES_CONNECTION_STRING "postgres://test:test123!@127.0.0.1:5432/matador")
set(POSTGRES_CONNECTION_STRING "postgres://news:news@127.0.0.1:15432/matador")
#set(POSTGRES_CONNECTION_STRING "postgres://test:test123!@127.0.0.1:15432/matador")
configure_file(Connection.hpp.in ${PROJECT_BINARY_DIR}/backends/postgres/test/connection.hpp @ONLY IMMEDIATE)

44
demo/work.cpp
View File

@ -70,35 +70,35 @@ using namespace work::models;
// payload.is_polymorphic_type<jobs::IdPayload>();
int main() {
object::schema schema("Administration");
const object::schema schema("Administration");
auto result = schema.attach<admin::CollectionCenter>("collection_centers")
.and_then([&schema] { return schema.attach<admin::UserDirectory>("user_directories"); })
.and_then([&schema] { return schema.attach<admin::LdapGroupSchemaSettings>("ldap_group_schema_settings"); })
.and_then([&schema] { return schema.attach<admin::LdapImportSettings>("ldap_import_settings"); })
.and_then([&schema] { return schema.attach<admin::LdapUserSchemaSettings>("ldap_user_schema_settings"); })
.and_then([&schema] { return schema.attach<admin::InternalUserDirectory, admin::UserDirectory>("internal_user_directories"); })
.and_then([&schema] { return schema.attach<admin::LdapUserDirectory, admin::UserDirectory>("ldap_user_directories"); } )
.and_then([&schema] { return schema.attach<admin::LoginHistory>("login_histories"); })
.and_then([&schema] { return schema.attach<admin::Scenario>("scenarios"); })
.and_then([&schema] { return schema.attach<admin::User>("users"); })
.and_then([&schema] { return schema.attach<admin::UserSession>("user_sessions"); })
.and_then([&schema] { return schema.attach<jobs::Job>("jobs"); })
.and_then([&schema] { return schema.attach<jobs::Payload>("payloads"); })
.and_then([&schema] { return schema.attach<jobs::IdPayload, jobs::Payload>("id_list_payloads"); })
.and_then([&schema] { return schema.attach<jobs::IdListPayload, jobs::Payload>("id_payloads"); })
.and_then([&schema] { return schema.attach<jobs::Task>("tasks"); });
sql::connection_pool<sql::connection> pool("postgres://news:news@127.0.0.1:15432/matador", 4);
orm::session ses(pool);
auto result = ses.attach<admin::CollectionCenter>("collection_centers");
// .and_then([&ses] { return ses.attach<admin::UserDirectory>("user_directories"); })
// .and_then([&ses] { return ses.attach<admin::LdapGroupSchemaSettings>("ldap_group_schema_settings"); })
// .and_then([&ses] { return ses.attach<admin::LdapImportSettings>("ldap_import_settings"); })
// .and_then([&ses] { return ses.attach<admin::LdapUserSchemaSettings>("ldap_user_schema_settings"); })
// .and_then([&ses] { return ses.attach<admin::InternalUserDirectory, admin::UserDirectory>("internal_user_directories"); })
// .and_then([&ses] { return ses.attach<admin::LdapUserDirectory, admin::UserDirectory>("ldap_user_directories"); } )
// .and_then([&ses] { return ses.attach<admin::LoginHistory>("login_histories"); })
// .and_then([&ses] { return ses.attach<admin::Scenario>("scenarios"); })
// .and_then([&ses] { return ses.attach<admin::User>("users"); })
// .and_then([&ses] { return ses.attach<admin::UserSession>("user_sessions"); })
// .and_then([&ses] { return ses.attach<jobs::Job>("jobs"); })
// .and_then([&ses] { return ses.attach<jobs::Payload>("payloads"); })
// .and_then([&ses] { return ses.attach<jobs::IdPayload, jobs::Payload>("id_list_payloads"); })
// .and_then([&ses] { return ses.attach<jobs::IdListPayload, jobs::Payload>("id_payloads"); })
// .and_then([&ses] { return ses.attach<jobs::Task>("tasks"); })
// .and_then([&ses] { return ses.create_schema(); });
if (!result) {
std::cout << "error: " << result.err().message() << std::endl;
return 0;
}
sql::connection_pool<sql::connection> pool("postgres://test:test123!@127.0.0.1:15432/postgres", 4);
orm::session ses(pool);
result = ses.create_schema();
schema.dump(std::cout);
// const std::string dns{"sqlite://demo.db"};
// sql::connection c(dns);

1
include/matador/object/attribute_definition_generator.hpp
View File

@ -97,7 +97,6 @@ public:
columns_.push_back(fk_column_generator_.generate(id, temp_val, *result));
} else {
columns_.push_back(fk_column_generator_.generate(id, *x, *result));
}
}
}

30
include/matador/object/schema.hpp
View File

@ -121,6 +121,9 @@ private:
static void link_relation_endpoints(const endpoint_ptr &endpoint,
const endpoint_ptr &other_endpoint);
template<typename ValueType>
void ensure_type_is_known();
private:
std::shared_ptr<schema_node> node_;
schema &schema_;
@ -143,7 +146,7 @@ public:
template<typename Type>
[[nodiscard]] utils::result<void, utils::error> attach(const std::string &name, const std::string &parent = "") {
// if (has_node(name)) {
// return utils::failure(make_error(error_code::NodeAlreadyExists, "Node '" + name + "' already exists"));
// return utils::failure(make_error(error_code::NodeAlreadyExists, "Node '" + name + "' already exists"));
// }
auto node = schema_node::make_node<Type>(*this, name);
relation_completer<Type>::complete(node);
@ -241,10 +244,14 @@ private:
const std::type_index &type_index);
[[nodiscard]] utils::result<node_ptr, utils::error> find_node(const std::string &name) const;
[[nodiscard]] utils::result<node_ptr, utils::error> find_node(const std::type_index &type_index) const;
template<typename Type>
[[nodiscard]] utils::result<node_ptr, utils::error> find_node() const {
return find_node(std::type_index(typeid(Type)));
}
[[nodiscard]] bool has_node(const std::string &name) const;
[[nodiscard]] bool has_node(const std::type_index &index) const;
[[nodiscard]] bool has_node(const std::type_index &index, const std::string &name) const;
[[nodiscard]] bool has_node(const node_ptr& node) const;
static void insert_node(const node_ptr &parent, const node_ptr &child);
void remove_node(const node_ptr &node);
@ -266,13 +273,15 @@ template<class CollectionType>
void relation_completer<Type>::on_has_many(const char *id, CollectionType &,
const char *join_column,
const utils::foreign_attributes &,
std::enable_if_t<is_object_ptr<typename CollectionType::value_type>::value> *
/*unused*/) {
std::enable_if_t<is_object_ptr<typename CollectionType::value_type>::value> * /*unused*/) {
// Shortcut to value type of object_ptr::value_type in collection
using value_type = typename CollectionType::value_type::value_type;
// Check if the object_ptr type is already inserted in the schema (by id)
if (auto result = schema_.find_node(id); !result) {
// Type was not found.
// Ensure value_type is known to the schema. Name will be added later
ensure_type_is_known<value_type>();
// Create and attach the relation node.
const std::type_index ti = typeid(many_to_many_relation<value_type, Type>);
if (const auto endpoint = node_->info().find_relation_endpoint(ti); endpoint == node_->info().endpoint_end()) {
@ -479,11 +488,20 @@ void relation_completer<Type>::register_relation_endpoints(const endpoint_ptr &e
}
template<typename Type>
void relation_completer<
Type>::link_relation_endpoints(const endpoint_ptr &endpoint, const endpoint_ptr &other_endpoint) {
void relation_completer<Type>::link_relation_endpoints(const endpoint_ptr &endpoint, const endpoint_ptr &other_endpoint) {
endpoint->link_foreign_endpoint(other_endpoint);
other_endpoint->link_foreign_endpoint(endpoint);
}
template<typename Type>
template<typename ValueType>
void relation_completer<Type>::ensure_type_is_known() {
if (auto result = schema_.find_node<ValueType>(); result) {
return;
}
auto result = schema_.attach_node(schema_node::make_node<Type>(schema_, ""), "");
relation_completer<ValueType>::complete(result.value());
}
}
#endif //SCHEMA_HPP

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

@ -27,6 +27,8 @@ public:
template<typename Type>
[[nodiscard]] utils::result<void, utils::error> attach(const std::string &table_name) const;
template<typename Type, typename SuperType>
[[nodiscard]] utils::result<void, utils::error> attach(const std::string &table_name) const;
utils::result<void, utils::error> create_schema() const;
@ -137,6 +139,11 @@ template<typename Type>
return schema_->attach<Type>(table_name);
}
template<typename Type, typename SuperType>
utils::result<void, utils::error> session::attach( const std::string& table_name ) const {
return schema_->attach<Type, SuperType>(table_name);
}
template<typename Type>
utils::result<object::object_ptr<Type>, utils::error> session::insert(Type *obj)
{

10
source/core/object/schema.cpp
View File

@ -89,7 +89,7 @@ void schema::dump(std::ostream &os) const {
utils::result<schema::node_ptr, utils::error> schema::attach_node(const std::shared_ptr<schema_node> &node,
const std::string &parent) {
if (has_node(node->type_index(), node->name())) {
if (has_node(node)) {
return utils::failure(make_error(error_code::NodeAlreadyExists, "Node '" + node->name() + "' already exists."));
}
@ -108,7 +108,7 @@ utils::result<schema::node_ptr, utils::error> schema::attach_node(const std::sha
insert_node(parent_node, node);
// Todo: check return value
nodes_by_name_.insert({node->name(), node})/*.first*/;
nodes_by_name_.insert({node->name(), node});
nodes_by_type_.insert({node->type_index(), node});
return utils::ok(node);
@ -116,7 +116,7 @@ utils::result<schema::node_ptr, utils::error> schema::attach_node(const std::sha
utils::result<schema::node_ptr, utils::error> schema::attach_node(const std::shared_ptr<schema_node> &node,
const std::type_index &type_index) {
if (has_node(node->type_index(), node->name())) {
if (has_node(node)) {
return utils::failure(make_error(error_code::NodeAlreadyExists, "Node '" + node->name() + "' already exists."));
}
auto result = find_node(type_index);
@ -202,7 +202,7 @@ bool schema::has_node(const std::type_index &index) const {
return nodes_by_type_.count(index) > 0;
}
bool schema::has_node(const std::type_index &index, const std::string &name) const {
return nodes_by_name_.count(name) > 0 || nodes_by_type_.count(index) > 0;
bool schema::has_node(const node_ptr& node) const {
return nodes_by_name_.count(node->name()) > 0 || nodes_by_type_.count(node->type_index()) > 0;
}
} // namespace matador::object

2
source/core/utils/error.cpp
View File

@ -6,7 +6,7 @@
namespace matador::utils {
std::string error::message() const {
return ec_.message();
return error_message_;
}
std::string error::category() const {