[DataMapper] Add DataMapperOptions in all query functions

Author: Yaraslaut

src/Lightweight/DataMapper/DataMapper.hpp

@@ -214,7 +214,7 @@ class DataMapper
     std::optional<Record> QuerySingle(PrimaryKeyTypes&&... primaryKeys);
 
     /// Queries multiple records from the database, based on the given query.
-    template <typename Record, typename... InputParameters>
+    template <typename Record, DataMapperOptions QueryOptions = {}, typename... InputParameters>
     std::vector<Record> Query(SqlSelectQueryBuilder::ComposedQuery const& selectQuery, InputParameters&&... inputParameters);
 
     /// Queries multiple records from the database, based on the given query.
@@ -246,7 +246,7 @@ class DataMapper
     ///     }
     /// }
     /// @endcode
-    template <typename Record, typename... InputParameters>
+    template <typename Record, DataMapperOptions QueryOptions = {}, typename... InputParameters>
     std::vector<Record> Query(std::string_view sqlQueryString, InputParameters&&... inputParameters);
 
     /// Queries records from the database, based on the given query and can be used to retrieve only part of the record
@@ -273,7 +273,7 @@ class DataMapper
     ///    // only info.name and info.city are loaded
     /// }
     /// @endcode
-    template <typename ElementMask, typename Record, typename... InputParameters>
+    template <typename ElementMask, typename Record, DataMapperOptions QueryOptions = {}, typename... InputParameters>
     std::vector<Record> Query(SqlSelectQueryBuilder::ComposedQuery const& selectQuery, InputParameters&&... inputParameters);
 
     /// Queries records of different types from the database, based on the given query.
@@ -305,27 +305,6 @@ class DataMapper
         requires DataMapperRecord<First> && DataMapperRecord<Second> && DataMapperRecords<Rest...>
     std::vector<std::tuple<First, Second, Rest...>> Query(SqlSelectQueryBuilder::ComposedQuery const& selectQuery);
 
-    /// Queries records of different types from the database, based on the given query.
-    template <typename FirstRecord, typename NextRecord, DataMapperOptions QueryOptions = {}>
-        requires DataMapperRecord<FirstRecord> && DataMapperRecord<NextRecord>
-    SqlAllFieldsQueryBuilder<std::tuple<FirstRecord, NextRecord>, QueryOptions> Query()
-    {
-        std::string fields;
-
-        auto const emplaceRecordsFrom = [&fields]<typename Record>() {
-            Reflection::EnumerateMembers<Record>([&fields]<size_t I, typename Field>() {
-                if (!fields.empty())
-                    fields += ", ";
-                fields += std::format(R"("{}"."{}")", RecordTableName<Record>, FieldNameAt<I, Record>);
-            });
-        };
-
-        emplaceRecordsFrom.template operator()<FirstRecord>();
-        emplaceRecordsFrom.template operator()<NextRecord>();
-
-        return SqlAllFieldsQueryBuilder<std::tuple<FirstRecord, NextRecord>, QueryOptions>(*this, std::move(fields));
-    }
-
     /// Queries records of given Record type.
     ///
     /// The query builder can be used to further refine the query.
@@ -1567,16 +1546,16 @@ std::optional<Record> DataMapper::QuerySingle(SqlSelectQueryBuilder selectQuery,
 // TODO: Provide Query(QueryBuilder, ...) method variant
 
 /// Queries multiple records from the database using a composed query and optional input parameters.
-template <typename Record, typename... InputParameters>
+template <typename Record, DataMapperOptions QueryOptions, typename... InputParameters>
 inline LIGHTWEIGHT_FORCE_INLINE std::vector<Record> DataMapper::Query(
     SqlSelectQueryBuilder::ComposedQuery const& selectQuery, InputParameters&&... inputParameters)
 {
     static_assert(DataMapperRecord<Record> || std::same_as<Record, SqlVariantRow>, "Record must satisfy DataMapperRecord");
 
-    return Query<Record>(selectQuery.ToSql(), std::forward<InputParameters>(inputParameters)...);
+    return Query<Record, QueryOptions>(selectQuery.ToSql(), std::forward<InputParameters>(inputParameters)...);
 }
 
-template <typename Record, typename... InputParameters>
+template <typename Record, DataMapperOptions QueryOptions, typename... InputParameters>
 std::vector<Record> DataMapper::Query(std::string_view sqlQueryString, InputParameters&&... inputParameters)
 {
     auto result = std::vector<Record> {};
@@ -1622,7 +1601,8 @@ std::vector<Record> DataMapper::Query(std::string_view sqlQueryString, InputPara
         for (auto& record: result)
         {
             SetModifiedState<ModifiedState::NotModified>(record);
-            ConfigureRelationAutoLoading(record);
+            if constexpr (QueryOptions.loadRelations)
+                ConfigureRelationAutoLoading(record);
         }
     }
 
@@ -1709,7 +1689,7 @@ std::vector<std::tuple<First, Second, Rest...>> DataMapper::Query(SqlSelectQuery
     return result;
 }
 
-template <typename ElementMask, typename Record, typename... InputParameters>
+template <typename ElementMask, typename Record, DataMapperOptions QueryOptions, typename... InputParameters>
 std::vector<Record> DataMapper::Query(SqlSelectQueryBuilder::ComposedQuery const& selectQuery,
                                       InputParameters&&... inputParameters)
 {
@@ -1744,7 +1724,8 @@ std::vector<Record> DataMapper::Query(SqlSelectQueryBuilder::ComposedQuery const
     for (auto& record: records)
     {
         SetModifiedState<ModifiedState::NotModified>(record);
-        ConfigureRelationAutoLoading(record);
+        if constexpr (QueryOptions.loadRelations)
+            ConfigureRelationAutoLoading(record);
     }
 
     return records;

src/examples/test_chinook/main.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
-#include <iterator>
 #include <format>
+#include <iterator>
 #include <optional>
 #include <print>
 #include <ranges>
@@ -11,8 +11,8 @@
 #ifdef LIGHTWEIGHT_BUILD_MODULES
 import Lightweight;
 #else
-#include <Lightweight/Lightweight.hpp>
-#include <Lightweight/SqlLogger.hpp>
+    #include <Lightweight/Lightweight.hpp>
+    #include <Lightweight/SqlLogger.hpp>
 #endif
 
 using std::basic_string_view;
@@ -78,16 +78,16 @@ void Log(format_string<Args...> fmt, Args&&... args)
 template <typename Entity>
 void DumpTable(DataMapper& dm, size_t limit = 1)
 {
-    const auto entries = dm.Query<Entity>().First(limit);
-    for (const auto& entry: entries)
+    auto const entries = dm.Query<Entity>().First(limit);
+    for (auto const& entry: entries)
     {
         Log("{}", DataMapper::Inspect(entry));
     }
 }
 
 int main()
 {
-    if (const auto odbcConnectionString = GetEnvironmentVariable("ODBC_CONNECTION_STRING"); !odbcConnectionString.empty())
+    if (auto const odbcConnectionString = GetEnvironmentVariable("ODBC_CONNECTION_STRING"); !odbcConnectionString.empty())
     {
         SqlConnection::SetDefaultConnectionString(SqlConnectionString { odbcConnectionString });
     }
@@ -101,24 +101,24 @@ int main()
     DataMapper dm;
 
     // helper function to create std::string from string_view<char16_t>
-    const auto toString = [](basic_string_view<char16_t> str) {
-        const auto u8Str = Lightweight::ToUtf8(str);
-        return string(reinterpret_cast<const char*>(u8Str.data()), u8Str.size());
+    auto const toString = [](basic_string_view<char16_t> str) {
+        auto const u8Str = Lightweight::ToUtf8(str);
+        return string(reinterpret_cast<char const*>(u8Str.data()), u8Str.size());
     };
 
     // get all employees
-    const auto employees = dm.Query<Employee>().All();
-    for (const auto& employee: employees)
+    auto const employees = dm.Query<Employee>().All();
+    for (auto const& employee: employees)
     {
         Log("EmployeeId: {}, FirstName: {}, LastName: {}",
             employee.EmployeeId.Value(),
             toString(employee.FirstName.Value().c_str()),
             toString(employee.LastName.Value().c_str()));
     }
 
-        // directly iterate over elements
+    // directly iterate over elements
     int numberOfAlbums = 0;
-    for (const auto& album: SqlRowIterator<Album>(dm.Connection()))
+    for (auto const& album: SqlRowIterator<Album>(dm.Connection()))
     {
         Log("{}", toString(album.Title.Value().c_str()));
         ++numberOfAlbums;
@@ -155,14 +155,14 @@ int main()
 
         Log("got {} albums", albums.size());
 
-        auto albumIds = albums | transform([](const auto& album) { return album.AlbumId.Value(); });
+        auto albumIds = albums | transform([](auto const& album) { return album.AlbumId.Value(); });
         // get all tracks from all albums
         auto tracks = dm.Query<Track>().WhereIn(FieldNameOf<&Track::AlbumId>, albumIds).All();
 
         Log("got {} tracks", tracks.size());
 
         // iterate over all tracks and print song names
-        for (const auto& track: tracks)
+        for (auto const& track: tracks)
         {
             Log("TrackId: {}, Name: {}, Bytes: {} , UnitPrice: {}",
                 track.TrackId.Value(),
@@ -181,17 +181,20 @@ int main()
                 toString(track.MediaTypeId->Name.ValueOr(u"").ToStringView()),
                 toString(track.GenreId.Record().transform(Unwrap).value().Name.ValueOr(u"").ToStringView()),
                 toString(track.AlbumId.Record().transform(Unwrap).value().Title.Value().ToStringView()),
-                toString(
-                    track.AlbumId.Record().transform(Unwrap).value().ArtistId->Name.ValueOr(u"").ToStringView()));
+                toString(track.AlbumId.Record().transform(Unwrap).value().ArtistId->Name.ValueOr(u"").ToStringView()));
             // NOLINTEND(bugprone-unchecked-optional-access)
         }
     }
 
     {
         // get pair of customer and employee
-        auto records = dm.Query<Customer, Employee>().InnerJoin<&Employee::EmployeeId, &Customer::SupportRepId>().All();
+        auto records = dm.Query<Customer, Employee>(dm.FromTable(Lightweight::RecordTableName<Customer>)
+                                                        .Select()
+                                                        .Fields<Customer, Employee>()
+                                                        .InnerJoin<&Employee::EmployeeId, &Customer::SupportRepId>()
+                                                        .All());
 
-        for (const auto& [customer, employee]: records)
+        for (auto const& [customer, employee]: records)
         {
             Log("CustomerId: {}, FirstName: {}, LastName: {}",
                 customer.CustomerId.Value(),
@@ -230,4 +233,3 @@ int main()
 
     Log("Found {} employees.", employees.size());
 }
-

src/tests/DataMapper/ReadTests.cpp

@@ -531,10 +531,12 @@ TEST_CASE_METHOD(SqlTestFixture, "MapForJointStatement", "[DataMapper]")
         dm.Create(c);
     }
 
-    auto const records = dm.Query<JoinA, JoinC>()
-                             .InnerJoin<Member(JoinB::a_id), Member(JoinA::id)>()
-                             .InnerJoin<Member(JoinC::id), Member(JoinB::c_id)>()
-                             .All();
+    auto const records = dm.Query<JoinA, JoinC>(dm.FromTable(RecordTableName<JoinA>)
+                                                    .Select()
+                                                    .Fields<JoinA, JoinC>()
+                                                    .InnerJoin<Member(JoinB::a_id), Member(JoinA::id)>()
+                                                    .InnerJoin<Member(JoinC::id), Member(JoinB::c_id)>()
+                                                    .All());
 
     CHECK(records.size() == 50);
     int i = 1;