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

fixed core- and orm-tests. postgres-tests needs some work

Browse Source
This commit is contained in:
Sascha Kühl
2025-11-20 15:35:40 +01:00
parent 95c555d03a
commit 3f3773dc71
17 changed files with 170 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/core/object/repository_node.cpp
+14 -11
View File
@@ -4,17 +4,17 @@
#include "matador/object/repository_node.hpp"
namespace matador::object {
repository_node::repository_node(object::repository &repo)
repository_node::repository_node(repository &repo)
: repo_(repo)
, type_index_(typeid(detail::null_type)){
}
repository_node::repository_node(object::repository &repo, const std::type_index& ti)
repository_node::repository_node(repository &repo, const std::type_index& ti)
: repo_(repo)
, type_index_(ti) {
}
repository_node::repository_node(object::repository &repo, std::string name, const std::type_index& ti)
repository_node::repository_node(repository &repo, std::string name, const std::type_index& ti)
: repo_(repo)
, type_index_(ti)
, first_child_(std::shared_ptr<repository_node>(new repository_node(repo)))
@@ -24,9 +24,9 @@ repository_node::repository_node(object::repository &repo, std::string name, con
last_child_->previous_sibling_ = first_child_;
}
std::shared_ptr<repository_node> repository_node::make_null_node(object::repository &repo) {
std::shared_ptr<repository_node> repository_node::make_null_node(repository &repo) {
auto node = std::shared_ptr<repository_node>(new repository_node(repo));
node->info_ = std::make_unique<null_info>(node, std::shared_ptr<attribute_definition>{});
node->info_ = std::make_unique<null_info>(node/*, std::shared_ptr<attribute_definition>{}*/);
return node;
}
@@ -45,8 +45,8 @@ const basic_object_info &repository_node::info() const {
void repository_node::update_name(const std::string& name) {
name_ = name;
if (info_->reference_column() && info_->reference_column()->object() != nullptr) {
info_->reference_column()->object()->name_ = name;
if (info_->reference_column()) {
info_->reference_column()->table_name(name);
}
}
@@ -104,20 +104,23 @@ utils::result<repository_node::node_ptr, utils::error> repository_node::make_and
return repo.attach_node(node, "");
}
std::shared_ptr<attribute_definition> repository_node::determine_reference_column(const std::type_index& ti, const std::shared_ptr<object_definition>& obj, const primary_key_info& pk_info, repository& repo) {
std::shared_ptr<attribute_definition> repository_node::determine_reference_column(const std::type_index& ti,
const std::string& table_name,
const primary_key_info& pk_info,
repository& repo) {
const auto it = repo.missing_references_.find(ti);
if (it == repo.missing_references_.end()) {
return std::make_shared<attribute_definition>(pk_info.pk_column_name, pk_info.type, attribute_options{utils::constraints::FOREIGN_KEY});
return std::make_shared<attribute_definition>(pk_info.pk_column_name, pk_info.type, table_name, attribute_options{utils::constraints::FOREIGN_KEY});
}
auto ref_column = it->second;
repo.missing_references_.erase(it);
ref_column->name(pk_info.pk_column_name);
ref_column->object(obj);
ref_column->table_name(table_name);
ref_column->change_type(pk_info.type);
ref_column->attributes() = utils::constraints::FOREIGN_KEY;
if (obj->name().empty()) {
if (table_name.empty()) {
repo.missing_references_.insert({ti, ref_column});
}