added checks to SessionInsertHasMany Test

include/matador/object/object_proxy.hpp

@@ -74,10 +74,11 @@ public:
   [[nodiscard]] const utils::identifier &primary_key() const { return pk_; }
   void primary_key(const utils::identifier &pk) { pk_ = pk; }
 
-  bool is_persistent() const { return state_ == object_state::Persistent; }
+  bool is_persistent() const { return is_state(object_state::Persistent); }
-  bool is_transient() const { return state_ == object_state::Transient; }
+  bool is_transient() const { return is_state(object_state::Transient); }
-  bool is_detached() const { return state_ == object_state::Detached; }
+  bool is_detached() const { return is_state(object_state::Detached); }
-  bool is_removed() const { return state_ == object_state::Removed; }
+  bool is_removed() const { return is_state(object_state::Removed); }
+  bool is_state(const object_state state) const { return state_ == state; }
 
   void change_state(const object_state state) {
     state_.store(state, std::memory_order_release);

include/matador/object/object_ptr.hpp

@@ -67,6 +67,7 @@ public:
   [[nodiscard]] bool is_transient() const { return proxy_->is_transient(); }
   [[nodiscard]] bool is_detached() const { return proxy_->is_detached(); }
   [[nodiscard]] bool is_removed() const { return proxy_->is_removed(); }
+  [[nodiscard]] bool is_state(const object_state state) const { return proxy_->is_state(state); }
 
   void change_state(object_state s) const {
     if (proxy_) {

test/backends/SessionInsertHasMany.cpp

@@ -16,16 +16,16 @@ using namespace matador::test;
 
 namespace matador::test {
 template<const utils::primary_key_attribute &PkAttribute>
-struct book_identity;
+struct book_pk_generator;
 
-template<const utils::primary_key_attribute &PkAttribute = utils::Identity>
+template<const utils::primary_key_attribute &PkAttribute>
-struct author_identity {
+struct author_pk_generator {
   unsigned int id{};
   std::string name;
-  collection<object_ptr<book_identity<PkAttribute>>> books;
+  collection<object_ptr<book_pk_generator<PkAttribute>>> books;
 
-  author_identity() = default;
+  author_pk_generator() = default;
-  explicit author_identity(std::string name)
+  explicit author_pk_generator(std::string name)
   : name(std::move(name)) {}
 
   template<typename Operator>
@@ -37,15 +37,15 @@ struct author_identity {
   }
 };
 
-template<const utils::primary_key_attribute &PkAttribute = utils::Identity>
+template<const utils::primary_key_attribute &PkAttribute>
-struct book_identity {
+struct book_pk_generator {
   unsigned int id{};
   std::string title;
-  object_ptr<author_identity<PkAttribute>> book_author;
+  object_ptr<author_pk_generator<PkAttribute>> book_author;
   unsigned short published_in{};
 
-  book_identity() = default;
+  book_pk_generator() = default;
-  book_identity(std::string title, object_ptr<author_identity<PkAttribute>> author, const unsigned short published_in)
+  book_pk_generator(std::string title, object_ptr<author_pk_generator<PkAttribute>> author, const unsigned short published_in)
   : title(std::move(title)), book_author(std::move(author)), published_in(published_in) {}
 
   template<typename Operator>
@@ -58,13 +58,36 @@ struct book_identity {
   }
 };
 
-using author_sequence = author_identity<utils::Sequence>;
+using author_identity = author_pk_generator<utils::Identity>;
-using author_table = author_identity<utils::Table>;
+using author_sequence = author_pk_generator<utils::Sequence>;
-using book_sequence = book_identity<utils::Sequence>;
+using author_table = author_pk_generator<utils::Table>;
-using book_table = book_identity<utils::Table>;
+using book_identity = book_pk_generator<utils::Identity>;
+using book_sequence = book_pk_generator<utils::Sequence>;
+using book_table = book_pk_generator<utils::Table>;
 
 }
 
+template<typename AuthorType, typename BookType>
+object_ptr<AuthorType> create_author() {
+  auto s_king = make_object<AuthorType>("Steven King");
+
+  s_king->books.push_back(make_object<BookType>("Carrie", nullobj, 1974));
+  s_king->books.push_back(make_object<BookType>("The Shining", nullobj, 1977));
+  s_king->books.push_back(make_object<BookType>("It", nullobj, 1986));
+  s_king->books.push_back(make_object<BookType>("Misery", nullobj, 1987));
+  s_king->books.push_back(make_object<BookType>("The Dark Tower: The Gunslinger", nullobj, 1982));
+
+  return s_king;
+}
+
+template<typename AuthorType>
+void validate_author_state(const object_ptr<AuthorType>& ptr, object_state expected_state) {
+  REQUIRE(ptr.is_state(expected_state));
+  for (auto &b: ptr->books) {
+    REQUIRE(b.is_state(expected_state));
+  }
+}
+
 TEST_CASE_METHOD(SessionFixture, "Test insert object with has many relation", "[session][insert][has_many]") {
   const auto result = schema.attach<book>("books")
     .and_then( [this] { return schema.attach<author>("authors"); } )
@@ -81,28 +104,26 @@ TEST_CASE_METHOD(SessionFixture, "Test insert object with has many relation", "[
   s_king->books.push_back(make_object<book>(5, "Misery", nullobj, 1987));
   s_king->books.push_back(make_object<book>(6, "The Dark Tower: The Gunslinger", nullobj, 1982));
 
+  validate_author_state(s_king, object_state::Transient);
   auto res = ses.insert(s_king);
   REQUIRE(res.is_ok());
+  validate_author_state(s_king, object_state::Persistent);
 }
 
 TEST_CASE_METHOD(SessionFixture, "Test insert object with has many relation with identity", "[session][insert][has_many][identity]") {
-  const auto result = schema.attach<book_identity<>>("books")
+  const auto result = schema.attach<book_identity>("books")
-    .and_then( [this] { return schema.attach<author_identity<>>("authors"); } )
+    .and_then( [this] { return schema.attach<author_identity>("authors"); } )
     .and_then([this] { return schema.create(db); } );
   REQUIRE(result.is_ok());
 
   session ses({bus, connection::dns, 4}, schema);
 
-  auto s_king = make_object<author_identity<>>("Steven King");
+  auto s_king = create_author<author_identity, book_identity>();
-
-  s_king->books.push_back(make_object<book_identity<>>("Carrie", nullobj, 1974));
-  s_king->books.push_back(make_object<book_identity<>>("The Shining", nullobj, 1977));
-  s_king->books.push_back(make_object<book_identity<>>("It", nullobj, 1986));
-  s_king->books.push_back(make_object<book_identity<>>("Misery", nullobj, 1987));
-  s_king->books.push_back(make_object<book_identity<>>("The Dark Tower: The Gunslinger", nullobj, 1982));
 
+  validate_author_state(s_king, object_state::Transient);
   auto res = ses.insert(s_king);
   REQUIRE(res.is_ok());
+  validate_author_state(s_king, object_state::Persistent);
 }
 
 TEST_CASE_METHOD(SessionFixture, "Test insert object with has many relation with sequence", "[session][insert][has_many][sequence]") {
@@ -113,16 +134,12 @@ TEST_CASE_METHOD(SessionFixture, "Test insert object with has many relation with
 
   session ses({bus, connection::dns, 4}, schema);
 
-  auto s_king = make_object<author_sequence>("Steven King");
+  auto s_king = create_author<author_sequence, book_sequence>();
-
-  s_king->books.push_back(make_object<book_sequence>("Carrie", nullobj, 1974));
-  s_king->books.push_back(make_object<book_sequence>("The Shining", nullobj, 1977));
-  s_king->books.push_back(make_object<book_sequence>("It", nullobj, 1986));
-  s_king->books.push_back(make_object<book_sequence>("Misery", nullobj, 1987));
-  s_king->books.push_back(make_object<book_sequence>("The Dark Tower: The Gunslinger", nullobj, 1982));
 
+  validate_author_state(s_king, object_state::Transient);
   auto res = ses.insert(s_king);
   REQUIRE(res.is_ok());
+  validate_author_state(s_king, object_state::Persistent);
 }
 
 TEST_CASE_METHOD(SessionFixture, "Test insert object with has many relation with table sequence", "[session][insert][has_many][table_sequence]") {
@@ -133,14 +150,16 @@ TEST_CASE_METHOD(SessionFixture, "Test insert object with has many relation with
 
   session ses({bus, connection::dns, 4}, schema);
 
-  auto s_king = make_object<author_table>("Steven King");
+  auto s_king = create_author<author_table, book_table>();
-
-  s_king->books.push_back(make_object<book_table>("Carrie", nullobj, 1974));
-  s_king->books.push_back(make_object<book_table>("The Shining", nullobj, 1977));
-  s_king->books.push_back(make_object<book_table>("It", nullobj, 1986));
-  s_king->books.push_back(make_object<book_table>("Misery", nullobj, 1987));
-  s_king->books.push_back(make_object<book_table>("The Dark Tower: The Gunslinger", nullobj, 1982));
 
+  validate_author_state(s_king, object_state::Transient);
   auto res = ses.insert(s_king);
   REQUIRE(res.is_ok());
+  validate_author_state(s_king, object_state::Persistent);
+
+  auto author_result = ses.find<author_table>(s_king->id);
+  REQUIRE(author_result);
+  auto author = *author_result;
+  REQUIRE(author.is_persistent());
+  REQUIRE(author->books.size() == 5);
 }