proxy lazy resolve progress
This commit is contained in:
@@ -4,7 +4,6 @@
|
||||
#include "matador/utils/identifier.hpp"
|
||||
|
||||
#include "matador/object/object_proxy.hpp"
|
||||
#include "matador/object/primary_key_resolver.hpp"
|
||||
|
||||
#include <memory>
|
||||
|
||||
@@ -15,8 +14,7 @@ public:
|
||||
object_ptr()
|
||||
: ptr_(std::make_shared<object_proxy<Type>>()) {}
|
||||
explicit object_ptr(Type *obj)
|
||||
: ptr_(std::make_shared<object_proxy<Type>>(obj))
|
||||
, pk_(primary_key_resolver::resolve_object(*obj).pk) {}
|
||||
: ptr_(std::make_shared<object_proxy<Type>>(obj)) {}
|
||||
object_ptr(const object_ptr &other) : ptr_(other.ptr_) {}
|
||||
object_ptr(object_ptr &&other) noexcept : ptr_(std::move(other.ptr_)) {}
|
||||
object_ptr &operator=(const object_ptr &other) = default;
|
||||
@@ -30,7 +28,6 @@ public:
|
||||
[[nodiscard]] bool empty() const { return ptr_->pointer() == nullptr; }
|
||||
void reset(Type *obj) {
|
||||
ptr_->reset(obj);
|
||||
pk_ = primary_key_resolver::resolve_object(*obj).pk;
|
||||
}
|
||||
|
||||
Type* get() const { return static_cast<Type*>(ptr_->pointer()); }
|
||||
@@ -38,11 +35,11 @@ public:
|
||||
operator bool() { return valid(); }
|
||||
bool valid() { return ptr_ != nullptr; }
|
||||
|
||||
[[nodiscard]] const utils::identifier& primary_key() const { return pk_; }
|
||||
void primary_key(const utils::identifier &pk) { pk_ = pk; }
|
||||
[[nodiscard]] bool has_primary_key() const { return ptr_->has_primary_key(); }
|
||||
[[nodiscard]] const utils::identifier& primary_key() const { return ptr_->primary_key(); }
|
||||
void primary_key(const utils::identifier &pk) { ptr_->primary_key(pk); }
|
||||
private:
|
||||
std::shared_ptr<object_proxy<Type>> ptr_{};
|
||||
utils::identifier pk_;
|
||||
};
|
||||
|
||||
template<typename>
|
||||
|
||||
Reference in New Issue
Block a user