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

added date_type_t, time_type_t and timestamp, ensure allocated postgres resources are released, split repository into basic_repository and repository.

Browse Source
This commit is contained in:
sascha
2026-01-06 15:43:20 +01:00
parent f07a360da2
commit 0c6b5a0a93
60 changed files with 1132 additions and 1225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/matador/object/object_generator.hpp
+15 -19
View File
@@ -1,7 +1,7 @@
#ifndef MATADOR_OBJECT_GENERATOR_HPP
#define MATADOR_OBJECT_GENERATOR_HPP
#include "matador/object/internal/shadow_repository.hpp"
#include "matador/object/basic_repository.hpp"
#include "matador/object/object.hpp"
#include "matador/utils/access.hpp"
@@ -10,8 +10,6 @@
#include <memory>
namespace matador::object {
class repository;
class pk_type_determinator {
private:
pk_type_determinator() = default;
@@ -51,26 +49,26 @@ private:
class object_generator {
private:
explicit object_generator(const repository& repo, const std::shared_ptr<object> &object);
explicit object_generator(basic_repository& repo, const std::shared_ptr<object> &object);
public:
template < class Type >
static std::shared_ptr<object> generate(const repository &repo, const std::string &name) {
static std::shared_ptr<object> generate(basic_repository &repo, const std::string &name) {
return generate(std::make_unique<Type>(), repo, name);
}
template < class Type >
static std::shared_ptr<object> generate(std::unique_ptr<Type>&& t, const repository &repo, const std::string &name) {
const internal::shadow_repository shadow_repo(const_cast<repository&>(repo));
static std::shared_ptr<object> generate(std::unique_ptr<Type>&& t, basic_repository &repo, const std::string &name) {
const std::type_index ti(typeid(Type));
if (shadow_repo.has_object_for_type(ti)) {
auto obj = shadow_repo.object_for_type(ti);
shadow_repo.remove_object_for_type(ti);
if (repo.has_object_for_type(ti)) {
auto obj = repo.object_for_type(ti);
repo.remove_object_for_type(ti);
obj->update_name(name);
return obj;
}
auto obj = shadow_repo.provide_object_in_advance(ti, std::make_shared<object>(name));
auto obj = std::make_shared<object>(name);
std::ignore = repo.provide_object_in_advance(ti, obj);
object_generator gen(repo, obj);
access::process(gen, *t);
return obj;
@@ -127,9 +125,9 @@ private:
template<typename Type>
[[nodiscard]] std::shared_ptr<object> fk_object() const;
static std::shared_ptr<object> acquire_object(repository &repo, const std::type_index &ti, const std::string& name);
static std::shared_ptr<object> acquire_object(basic_repository &repo, const std::type_index &ti, const std::string& name);
private:
const repository &repo_;
basic_repository &repo_;
std::shared_ptr<object> object_;
};
@@ -137,7 +135,6 @@ template<typename ValueType>
void object_generator::on_primary_key(const char *id, ValueType &x, const utils::primary_key_attribute& attr) {
auto &ref = emplace_attribute<ValueType>(id, { attr.size(), utils::constraints::PrimaryKey }, null_option_type::NotNull);
prepare_primary_key(ref, utils::identifier(x));
// create_pk_constraint(id);
}
template<typename Type>
@@ -167,15 +164,14 @@ void object_generator::create_fk_constraint(const std::string& name) const {
template<typename Type>
std::shared_ptr<object> object_generator::fk_object() const {
const auto ti = std::type_index(typeid(Type));
const internal::shadow_repository shadow_repo(const_cast<repository &>(repo_));
if (const auto result = shadow_repo.basic_info(ti)) {
if (const auto result = repo_.basic_info(ti)) {
return result->get().object();
}
if (shadow_repo.has_object_for_type(ti)) {
return shadow_repo.object_for_type(ti);
if (repo_.has_object_for_type(ti)) {
return repo_.object_for_type(ti);
}
const auto obj = shadow_repo.provide_object_in_advance(ti, std::make_shared<object>(""));
const auto obj = repo_.provide_object_in_advance(ti, std::make_shared<object>(""));
object_generator gen(repo_, obj);
Type t;
access::process(gen, t);