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

compilation fixes

Browse Source
This commit is contained in:
Sascha Kühl
2025-11-19 16:17:25 +01:00
parent 9c42df3f83
commit 95c555d03a
20 changed files with 118 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/core/object/attribute_definition.cpp
+2 -1
View File
@@ -35,8 +35,9 @@ attribute_definition::attribute_definition( std::string name, const utils::basic
: attribute_definition(std::move(name), type, {}, {}, ref_column) {
}
attribute_definition::attribute_definition( std::string name, const utils::basic_type type, const attribute_options& options, const std::shared_ptr<object_definition>& obj, const std::shared_ptr<attribute_definition>& ref_column )
attribute_definition::attribute_definition(std::string name, const utils::basic_type type, const attribute_options& options, const std::shared_ptr<object_definition>& obj, const std::shared_ptr<attribute_definition>& ref_column)
: name_( std::move( name ) )
, object_( obj )
, options_( options )
, type_( type )
, reference_column_( ref_column ) {
source/core/object/basic_object_info.cpp
+5 -5
View File
@@ -8,9 +8,9 @@ namespace matador::object {
basic_object_info::basic_object_info(std::shared_ptr<repository_node> node,
utils::identifier &&pk,
const std::shared_ptr<attribute_definition> &pk_column,
object_definition &&definition)
const std::shared_ptr<object_definition> &definition)
: node_(std::move(node))
, definition_(std::move(definition))
, definition_(definition)
, identifier_(std::move(pk))
, pk_column_(pk_column) {
}
@@ -24,9 +24,9 @@ basic_object_info::basic_object_info(std::shared_ptr<repository_node> node,
}
basic_object_info::basic_object_info(std::shared_ptr<repository_node> node,
object_definition &&definition)
const std::shared_ptr<object_definition> &definition)
: node_(std::move(node))
, definition_(std::move(definition)) {}
, definition_(definition) {}
std::type_index basic_object_info::type_index() const {
return node_->type_index();
@@ -36,7 +36,7 @@ std::string basic_object_info::name() const {
return node_->name();
}
const object_definition &basic_object_info::definition() const {
std::shared_ptr<object_definition> basic_object_info::definition() const {
return definition_;
}
source/core/object/repository.cpp
-19
View File
@@ -117,25 +117,6 @@ utils::result<repository::node_ptr, utils::error> repository::attach_node(const
return utils::ok(node);
}
// 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)) {
// return utils::failure(make_error(error_code::NodeAlreadyExists, "Node '" + node->name() + "' already exists."));
// }
// auto result = find_node(type_index);
// if (!result.is_ok() && result.err().ec() != error_code::NodeNotFound) {
// return result;
// }
//
// insert_node(*result, node);
//
// // Todo: check return value
// nodes_by_name_.insert({node->name(), node})/*.first*/;
// nodes_by_type_.insert({node->type_index(), node});
//
// return utils::ok(node);
// }
utils::result<repository::node_ptr, utils::error> repository::find_node(const std::string &name) const {
// first search in the prototype map
const auto i = nodes_by_name_.find(name);
source/core/object/repository_node.cpp
+12 -12
View File
@@ -4,28 +4,28 @@
#include "matador/object/repository_node.hpp"
namespace matador::object {
repository_node::repository_node(object::repository &tree)
: repo_(tree)
repository_node::repository_node(object::repository &repo)
: repo_(repo)
, type_index_(typeid(detail::null_type)){
}
repository_node::repository_node(object::repository &tree, const std::type_index& ti)
: repo_(tree)
repository_node::repository_node(object::repository &repo, const std::type_index& ti)
: repo_(repo)
, type_index_(ti) {
}
repository_node::repository_node(object::repository &tree, std::string name, const std::type_index& ti)
: repo_(tree)
repository_node::repository_node(object::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(tree)))
, last_child_(std::shared_ptr<repository_node>(new repository_node(tree)))
, first_child_(std::shared_ptr<repository_node>(new repository_node(repo)))
, last_child_(std::shared_ptr<repository_node>(new repository_node(repo)))
, name_(std::move(name)) {
first_child_->next_sibling_ = last_child_;
last_child_->previous_sibling_ = first_child_;
}
std::shared_ptr<repository_node> repository_node::make_null_node(object::repository &tree) {
auto node = std::shared_ptr<repository_node>(new repository_node(tree));
std::shared_ptr<repository_node> repository_node::make_null_node(object::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>{});
return node;
@@ -104,7 +104,7 @@ 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, 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::shared_ptr<object_definition>& obj, 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});
@@ -117,7 +117,7 @@ std::shared_ptr<attribute_definition> repository_node::determine_reference_colum
ref_column->change_type(pk_info.type);
ref_column->attributes() = utils::constraints::FOREIGN_KEY;
if (obj.name().empty()) {
if (obj->name().empty()) {
repo.missing_references_.insert({ti, ref_column});
}
source/orm/orm/schema.cpp
+1 -1
View File
@@ -57,7 +57,7 @@ matador::utils::result<void, matador::utils::error> matador::orm::schema::create
// std::cout << result.sql << std::endl;
for (const auto &node: repo_) {
auto ctx = query::query::create()
.table(node->name(), node->info().definition().columns())
.table(node->name(), node->info().definition()->columns())
.compile(*c);
for ( const auto& [sql, command] : ctx.additional_commands ) {
source/orm/orm/session.cpp
+1 -1
View File
@@ -52,7 +52,7 @@ utils::result<void, utils::error> session::create_schema() const {
auto c = cache_.pool().acquire();
for (const auto &node: *schema_) {
auto ctx = query::query::create()
.table(node->name(), node->info().definition().columns())
.table(node->name(), node->info().definition()->columns())
.compile(*c);
for ( const auto& [sql, command] : ctx.additional_commands ) {
source/orm/query/builder.cpp
+2 -2
View File
@@ -42,8 +42,8 @@ constraint_builder& constraint_builder::references( std::string table, std::stri
return *this;
}
constraint_builder::operator struct query::constraint() const {
return {constraint_name};
constraint_builder::operator object::constraint() const {
return object::constraint{constraint_name};
}
constraint_builder constraint( std::string name ) {