fixed object generation on nested objects

source/core/object/internal/shadow_repository.cpp

@@ -15,6 +15,10 @@ bool shadow_repository::contains( const std::type_index& ti ) const {
   return repo_.contains(ti);
 }
 
+utils::result<basic_object_info_ref, utils::error> shadow_repository::basic_info(const std::type_index& ti) const {
+  return repo_.basic_info(ti);
+}
+
 utils::result<shadow_repository::node_ptr, utils::error> shadow_repository::find_node( const std::type_index& type_index ) const {
   return repo_.find_node(type_index);
 }
@@ -42,4 +46,20 @@ void shadow_repository::expect_relation_node(const std::string &name, const std:
 void shadow_repository::remove_expected_relation_node(const std::string &name) const {
   repo_.remove_expected_relation_node(name);
 }
+
+std::shared_ptr<object> shadow_repository::provide_object_in_advance(const std::type_index& ti, const std::shared_ptr<object>& obj) const {
+  return repo_.provide_object_in_advance(ti, obj);
+}
+
+bool shadow_repository::has_object_for_type(const std::type_index& ti) const {
+  return repo_.has_object_for_type(ti);
+}
+
+std::shared_ptr<object> shadow_repository::object_for_type(const std::type_index& ti) const {
+  return repo_.object_for_type(ti);
+}
+
+void shadow_repository::remove_object_for_type(const std::type_index& ti) const {
+  repo_.remove_object_for_type(ti);
+}
 }

source/core/object/object.cpp

@@ -50,7 +50,7 @@ size_t object::constraint_count() const {
   return constraints_.size();
 }
 
-const std::list<class restriction>& object::constraints() const {
+const std::list<restriction>& object::constraints() const {
   return constraints_;
 }
 

source/core/object/object_generator.cpp

@@ -35,19 +35,6 @@ void object_generator::create_pk_constraint(const std::string& name) const {
     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 pk_attr = find_attribute_by_name(name);
-    if (pk_attr == std::end(object_->attributes_)) {
-        return;
-    }
-    const auto obj = fk_object(ti);
-    restriction pk_constraint(*pk_attr);
-    pk_constraint.options_ |= utils::constraints::ForeignKey;
-    pk_constraint.owner_ = object_;
-    pk_constraint.reference_ = obj;
-    object_->constraints_.emplace_back(std::move(pk_constraint));
-}
-
 void object_generator::create_unique_constraint(const std::string& name) const {
     const auto pk_attr = find_attribute_by_name(name);
     if (pk_attr == std::end(object_->attributes_)) {
@@ -68,16 +55,4 @@ void object_generator::prepare_primary_key(attribute& ref, utils::identifier &&p
     object_->pk_attribute_ = &ref;
     object_->pk_identifier_ = std::move(pk);
 }
-
-std::shared_ptr<object> object_generator::fk_object(const std::type_index& ti) const {
-  const auto result = repo_.basic_info(ti);
-  if (result) {
-    return result->get().object();
-  }
-
-  if (repo_.has_object_for_type(ti)) {
-    return repo_.object_for_type(ti);
-  }
-  return repo_.provide_object_in_advance(ti, std::make_shared<object>(""));
-}
 }

source/core/object/restriction.cpp

@@ -40,6 +40,9 @@ const std::string& restriction::ref_column_name() const {
 
 std::ostream & operator<<(std::ostream &os, const class restriction &c) {
   os << "constraint " << c.type_string() << " for column " << c.column_name();
+  if (c.is_foreign_key_constraint()) {
+    os << " references " << c.ref_table_name() << "." << c.ref_column_name();
+  }
   return os;
 }