object generating progress
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
#define SCHEMA_NODE_HPP
|
||||
|
||||
#include "matador/object/attribute_generator.hpp"
|
||||
#include "matador/object/object.hpp"
|
||||
#include "matador/object/object_generator.hpp"
|
||||
#include "matador/object/object_info.hpp"
|
||||
#include "matador/object/primary_key_resolver.hpp"
|
||||
|
||||
@@ -23,7 +23,7 @@ public:
|
||||
|
||||
primary_key_resolver resolver;
|
||||
auto pk_info = resolver.resolve<Type>();
|
||||
auto obj = object::generate<Type>(repo, name);
|
||||
auto obj = object_generator::generate<Type>(repo, name);
|
||||
auto info = std::make_unique<object_info<Type>>(
|
||||
node,
|
||||
std::move(obj),
|
||||
@@ -41,12 +41,11 @@ public:
|
||||
return result;
|
||||
}
|
||||
|
||||
auto obj = creator();
|
||||
object o(name);
|
||||
auto obj = object_generator::generate(creator(), repo, name);
|
||||
auto info = std::make_unique<object_info<Type>>(
|
||||
result.value(),
|
||||
attribute_generator::generate(*obj, repo, o),
|
||||
std::forward<CreatorFunc>(creator)
|
||||
result.value(),
|
||||
std::move(obj),
|
||||
std::forward<CreatorFunc>(creator)
|
||||
);
|
||||
result.value()->info_ = std::move(info);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user