Merge pull request #406 from LASTRADA-Software/improvement/datamapper_create

Add DataMapperOptions template argument to the Create function

Author: Yaraslaut

.github/workflows/build.yml

@@ -45,7 +45,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
       with:
-        persist-credentials: true
+        #persist-credentials: true
         repository: ${{ github.event.pull_request.head.repo.full_name }}
         ref: ${{ github.event.pull_request.head.ref }}
         # token: ${{ secrets.CLANG_FORMAT_PAT }}

src/Lightweight/DataMapper/DataMapper.hpp

@@ -155,7 +155,7 @@ class DataMapper
     /// The record is inserted into the database and the primary key is set on this record.
     ///
     /// @return The primary key of the newly created record.
-    template <typename Record>
+    template <DataMapperOptions QueryOptions = {}, typename Record>
     RecordPrimaryKeyType<Record> Create(Record& record);
 
     /// @brief Creates a new record in the database.
@@ -1306,7 +1306,7 @@ RecordPrimaryKeyType<Record> DataMapper::CreateExplicit(Record const& record)
     }
 }
 
-template <typename Record>
+template <DataMapperOptions QueryOptions, typename Record>
 RecordPrimaryKeyType<Record> DataMapper::Create(Record& record)
 {
     static_assert(!std::is_const_v<Record>);
@@ -1371,7 +1371,9 @@ RecordPrimaryKeyType<Record> DataMapper::Create(Record& record)
         SetId(record, _stmt.LastInsertId(RecordTableName<Record>));
 
     ClearModifiedState(record);
-    ConfigureRelationAutoLoading(record);
+
+    if constexpr (QueryOptions.loadRelations)
+        ConfigureRelationAutoLoading(record);
 
     if constexpr (HasPrimaryKey<Record>)
         return GetPrimaryKeyField(record);

src/Lightweight/DataMapper/HasMany.hpp

@@ -188,7 +188,7 @@ inline LIGHTWEIGHT_FORCE_INLINE std::size_t HasMany<OtherRecord>::Count() const
     if (_records)
         return _records->size();
 
-    if (!_count)
+    if (!_count && _loader.count)
         const_cast<HasMany<OtherRecord>*>(this)->_count = _loader.count();
 
     return _count.value_or(0);

src/Lightweight/DataMapper/QueryBuilders.hpp

@@ -20,8 +20,7 @@ class DataMapper;
 /// when using query builder directly from the DataMapper
 struct DataMapperOptions
 {
-    /// This is the default behavior since compilation times significantly increase otherwise.
-    bool loadRelations { false };
+    bool loadRelations { true };
 };
 
 /// Main API for mapping records to C++ from the database using high level C++ syntax.

src/tests/DataMapper/CreateTests.cpp

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "../Utils.hpp"
+#include "Entities.hpp"
 
 #include <Lightweight/Lightweight.hpp>
 
@@ -137,4 +138,24 @@ TEST_CASE_METHOD(SqlTestFixture, "Table with multiple primary keys", "[DataMappe
     CHECK(queriedRecord == record);
 }
 
+TEST_CASE_METHOD(SqlTestFixture, "Loading of the dependent records after create", "[DataMapper]")
+{
+    auto dm = DataMapper();
+
+    dm.CreateTables<User, NullableForeignKeyUser>();
+
+    auto user = User { .id = SqlGuid::Create(), .name = "John Doe" };
+    dm.Create(user);
+
+    auto nullableFKUser = NullableForeignKeyUser { .user = user };
+    dm.Create(nullableFKUser);
+    REQUIRE(nullableFKUser.user.Value().has_value());
+    REQUIRE(nullableFKUser.user->id.Value() == user.id.Value());
+
+    auto nullableFKUserNotSet = NullableForeignKeyUser {};
+    dm.Create(nullableFKUserNotSet);
+    REQUIRE(!nullableFKUserNotSet.user.Value().has_value());
+}
+
+
 // NOLINTEND(bugprone-unchecked-optional-access)

src/tests/DataMapper/Entities.hpp

@@ -53,6 +53,12 @@ struct Email
     constexpr std::weak_ordering operator<=>(Email const& other) const = default;
 };
 
+struct NullableForeignKeyUser
+{
+    Light::Field<Light::SqlGuid, Light::PrimaryKey::AutoAssign> id {};
+    Light::BelongsTo<Member(User::id), Light::SqlRealName { "user_id" }, Light::SqlNullable::Null> user {};
+};
+
 struct Physician;
 struct Appointment;
 struct Patient;