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

object changes

Browse Source
This commit is contained in:
Sascha Kühl
2025-12-09 14:47:08 +01:00
parent d4a8801cd2
commit 4fcbe9c064
19 changed files with 109 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/core/object/basic_object_info.cpp
+5 -20
View File
@@ -5,22 +5,7 @@
#include <algorithm>
namespace matador::object {
// basic_object_info::basic_object_info(std::shared_ptr<repository_node> node,
// const std::vector<attribute> &attributes,
// utils::identifier &&pk,
// const std::shared_ptr<attribute> &pk_as_fk_column)
// : node_(std::move(node))
// , attributes_(attributes)
// , identifier_(std::move(pk))
// , pk_as_fk_column_(pk_as_fk_column) {
// }
//
// basic_object_info::basic_object_info(std::shared_ptr<repository_node> node,
// const std::vector<attribute> &attributes)
// : node_(std::move(node))
// , attributes_(attributes) {}
basic_object_info::basic_object_info(std::shared_ptr<repository_node> node, std::unique_ptr<class object>&& obj)
basic_object_info::basic_object_info(std::shared_ptr<repository_node> node, std::shared_ptr<class object>&& obj)
: object_(std::move(obj))
, node_(std::move(node)) {}
@@ -32,8 +17,8 @@ std::string basic_object_info::name() const {
return node_->name();
}
const class object & basic_object_info::object() const {
return *object_;
std::shared_ptr<class object> basic_object_info::object() const {
return object_;
}
const std::list<attribute>& basic_object_info::attributes() const {
@@ -56,7 +41,7 @@ attribute* basic_object_info::primary_key_attribute() const {
return object_->primary_key_attribute();
}
void basic_object_info::update_name(const std::string& name) {
void basic_object_info::update_name(const std::string& name) const {
object_->update_name(name);
}
@@ -112,4 +97,4 @@ std::size_t basic_object_info::endpoints_size() const {
bool basic_object_info::endpoints_empty() const {
return relation_endpoints_.empty();
}
} // namespace matador::object
}
source/core/object/constraint.cpp
+1 -1
View File
@@ -28,7 +28,7 @@ std::string constraint::column_name() const {
return "";
}
const object* constraint::owner() const {
std::shared_ptr<object> constraint::owner() const {
return owner_;
}
source/core/object/constraints_generator.cpp
+11 -11
View File
@@ -5,18 +5,18 @@
#include <algorithm>
namespace matador::object {
constraints_generator::constraints_generator(std::list<class constraint> &constraints, const repository& repo, object &obj)
constraints_generator::constraints_generator(std::list<class constraint> &constraints, const repository& repo, const std::shared_ptr<object> &obj)
: constraints_(constraints)
, repo_(repo)
, obj_(obj) {}
void constraints_generator::create_pk_constraint(const std::string& name) const {
class constraint pk_constraint("PK_" + obj_.name());
class constraint pk_constraint("PK_" + obj_->name());
pk_constraint.options_ |= utils::constraints::PrimaryKey;
if (const auto pk_attr = find_attribute_by_name(name); pk_attr != std::end(obj_.attributes_)) {
if (const auto pk_attr = find_attribute_by_name(name); pk_attr != std::end(obj_->attributes_)) {
pk_constraint.attr_ = &*pk_attr;
}
pk_constraint.owner_ = &obj_;
pk_constraint.owner_ = obj_;
constraints_.emplace_back(std::move(pk_constraint));
}
@@ -26,28 +26,28 @@ void constraints_generator::create_fk_constraint(const std::type_index& ti, cons
return;
}
const auto *pk_attribute = result.value().get().primary_key_attribute();
class constraint pk_constraint("FK_" + obj_.name() + "_" + name);
class constraint pk_constraint("FK_" + obj_->name() + "_" + name);
pk_constraint.options_ |= utils::constraints::ForeignKey;
if (const auto pk_attr = find_attribute_by_name(name); pk_attr != std::end(obj_.attributes_)) {
if (const auto pk_attr = find_attribute_by_name(name); pk_attr != std::end(obj_->attributes_)) {
pk_constraint.attr_ = &*pk_attr;
}
pk_constraint.owner_ = &obj_;
pk_constraint.owner_ = obj_;
pk_constraint.ref_column_name_ = pk_attribute->name();
pk_constraint.ref_table_name_ = pk_attribute->owner() ? pk_attribute->owner()->name() : "";
constraints_.emplace_back(std::move(pk_constraint));
}
void constraints_generator::create_unique_constraint(const std::string& name) const {
class constraint pk_constraint("UK_" + obj_.name() + "_" + name);
class constraint pk_constraint("UK_" + obj_->name() + "_" + name);
pk_constraint.options_ |= utils::constraints::Unique;
if (const auto pk_attr = find_attribute_by_name(name); pk_attr != std::end(obj_.attributes_)) {
if (const auto pk_attr = find_attribute_by_name(name); pk_attr != std::end(obj_->attributes_)) {
pk_constraint.attr_ = &*pk_attr;
}
pk_constraint.owner_ = &obj_;
pk_constraint.owner_ = obj_;
}
std::list<attribute>::iterator constraints_generator::find_attribute_by_name(const std::string& name) const {
return std::find_if(std::begin(obj_.attributes_), std::end(obj_.attributes_), [&name](const attribute& elem) {
return std::find_if(std::begin(obj_->attributes_), std::end(obj_->attributes_), [&name](const attribute& elem) {
return elem.name() == name;
});
}
source/core/object/object.cpp
+9 -9
View File
@@ -11,15 +11,15 @@ const attribute& object::create_attribute( std::string name, object& obj ) {
return obj.attributes_.emplace_back(std::move(attr));
}
void object::add_attribute( attribute attr ) {
auto &ref = attributes_.emplace_back(std::move(attr));
ref.owner_ = this;
}
void object::add_constraint( class constraint c ) {
auto &ref = constraints_.emplace_back(std::move(c));
ref.owner_ = this;
}
// void object::add_attribute( attribute attr ) {
// auto &ref = attributes_.emplace_back(std::move(attr));
// ref.owner_ = this;
// }
//
// void object::add_constraint( class constraint c ) {
// auto &ref = constraints_.emplace_back(std::move(c));
// ref.owner_ = this;
// }
attribute* object::primary_key_attribute() const {
return pk_attribute_;
source/core/object/object_generator.cpp
+21 -16
View File
@@ -5,9 +5,9 @@
#include <algorithm>
namespace matador::object {
object_generator::object_generator( const repository& repo, std::unique_ptr<object>&& object )
object_generator::object_generator(repository& repo, const std::shared_ptr<object>& object)
: repo_(repo)
, object_(std::move(object)) {}
, object_(object) {}
void object_generator::on_revision(const char* id, uint64_t& rev) {
on_attribute(id, rev);
@@ -19,28 +19,24 @@ void object_generator::create_pk_constraint(const std::string& name) const {
if (const auto pk_attr = find_attribute_by_name(name); pk_attr != std::end(object_->attributes_)) {
pk_constraint.attr_ = &*pk_attr;
}
pk_constraint.owner_ = object_.get();
pk_constraint.owner_ = object_;
object_->constraints_.emplace_back(std::move(pk_constraint));
}
void object_generator::create_fk_constraint(const std::type_index& ti, const std::string& name) const {
const auto result = repo_.basic_info(ti);
if (!result) {
repo_.provide_object_in_advance(ti, std::make_shared<object>(""));
repo_.has_object_for_type(ti);
repo_.object_for_type(ti);
repo_.remove_object_for_type(ti);
return;
}
const auto *pk_attribute = result->get().primary_key_attribute();
const auto obj = fk_object(ti);
const auto *pk_attribute = obj->primary_key_attribute();
class constraint pk_constraint("FK_" + object_->name() + "_" + name);
pk_constraint.options_ |= utils::constraints::ForeignKey;
if (const auto pk_attr = find_attribute_by_name(name); pk_attr != std::end(object_->attributes_)) {
pk_constraint.attr_ = &*pk_attr;
}
pk_constraint.owner_ = object_.get();
pk_constraint.ref_column_name_ = pk_attribute->name();
pk_constraint.ref_table_name_ = pk_attribute->owner() ? pk_attribute->owner()->name() : "";
pk_constraint.owner_ = object_;
pk_constraint.reference_ = obj;
if (pk_attribute) {
pk_constraint.ref_column_name_ = pk_attribute->name();
pk_constraint.ref_table_name_ = pk_attribute->owner() ? pk_attribute->owner()->name() : "";
}
object_->constraints_.emplace_back(std::move(pk_constraint));
}
@@ -50,7 +46,7 @@ void object_generator::create_unique_constraint(const std::string& name) const {
if (const auto pk_attr = find_attribute_by_name(name); pk_attr != std::end(object_->attributes_)) {
pk_constraint.attr_ = &*pk_attr;
}
pk_constraint.owner_ = object_.get();
pk_constraint.owner_ = object_;
}
std::list<attribute>::iterator object_generator::find_attribute_by_name(const std::string& name) const {
@@ -63,4 +59,13 @@ void object_generator::prepare_primary_key(attribute& ref, utils::identifier &&p
object_->pk_attribute_ = &ref;
object_->pk_identifier_ = std::move(pk);
}
std::shared_ptr<class object> object_generator::fk_object(const std::type_index& ti) const {
const auto result = repo_.basic_info(ti);
if (result) {
return result->get().object();
}
return repo_.provide_object_in_advance(ti, std::make_shared<object>(""));
}
}
source/core/object/repository.cpp
+17 -1
View File
@@ -62,7 +62,7 @@ utils::result<basic_object_info_ref, utils::error> repository::basic_info(const
return utils::ok(basic_object_info_ref{result.value()->info()});
}
utils::result<basic_object_info_ref, utils::error> repository::basic_info( const std::string& name ) const {
utils::result<basic_object_info_ref, utils::error> repository::basic_info(const std::string& name) const {
auto result = find_node(name);
if (!result) {
return utils::failure(result.err());
@@ -213,4 +213,20 @@ void repository::expect_relation_node(const std::string &name, const std::type_i
void repository::remove_expected_relation_node( const std::string& name ) {
expected_relation_nodes_.erase(name);
}
std::shared_ptr<object> repository::provide_object_in_advance(const std::type_index &ti, const std::shared_ptr<object>& obj) {
return object_by_type_.insert({ti, obj}).first->second;
}
bool repository::has_object_for_type(const std::type_index &ti) const {
return object_by_type_.count(ti) > 0;
}
std::shared_ptr<object> repository::object_for_type(const std::type_index &ti) const {
return object_by_type_.at(ti);
}
void repository::remove_object_for_type(const std::type_index &ti) {
object_by_type_.erase(ti);
}
} // namespace matador::object