More fixes to read

Author: mcraveiro

include/sqlgen/read.hpp

@@ -102,15 +102,17 @@ struct Read {
   friend auto operator|(const Read& _r, const Limit& _limit) {
     static_assert(std::is_same_v<LimitType, Nothing>,
                   "You cannot call limit(...) twice.");
-    return Read<Type, WhereType, OrderByType, Limit, Offset>{.where_ = _r.where_,
-                                                     .limit_ = _limit};
+    return Read<Type, WhereType, OrderByType, Limit, OffsetType>{.where_ = _r.where_,
+                                                                 .limit_ = _limit,
+                                                                 .offset_ = _r.offset_};
   }
 
   friend auto operator|(const Read& _r, const Offset& _offset) {
     static_assert(std::is_same_v<OffsetType, Nothing>,
                   "You cannot call offset(...) twice.");
-    return Read<Type, WhereType, OrderByType, Limit, Offset>{.where_ = _r.where_,
-                                                     .offset_ = _offset};
+    return Read<Type, WhereType, OrderByType, LimitType, Offset>{.where_ = _r.where_,
+                                                                 .limit_ = _r.limit_,
+                                                                 .offset_ = _offset};
   }
 
   WhereType where_;

include/sqlgen/select_from.hpp

@@ -300,7 +300,8 @@ struct SelectFrom {
                                  .from_ = _s.from_,
                                  .joins_ = _s.joins_,
                                  .where_ = _s.where_,
-                                 .limit_ = _s.limit_};
+                                 .limit_ = _s.limit_,
+                                 .offset_ = _s.offset_};
   }
 
   FieldsType fields_;

include/sqlgen/transpilation/read_to_select_from.hpp

@@ -50,7 +50,8 @@ dynamic::SelectFrom read_to_select_from(const WhereType& _where = WhereType{},
       .fields = fields,
       .where = to_condition<std::remove_cvref_t<T>>(_where),
       .order_by = to_order_by<OrderByType>(),
-      .limit = to_limit(_limit)};
+      .limit = to_limit(_limit),
+      .offset = to_offset(_offset)};
 }
 
 }  // namespace sqlgen::transpilation

tests/sqlite/test_offset.cpp

@@ -34,7 +34,10 @@ TEST(sqlite, test_offset) {
   using namespace sqlgen::literals;
 
   const auto query =
-      sqlgen::read<std::vector<Person>> | order_by("id"_c) | offset(3);
+          sqlgen::read<std::vector<Person>> | order_by("id"_c) | offset(3);
+
+  const auto sql = sqlite::to_sql(query);
+  std::cout << "SQL: " << sql << std::endl;
 
   const auto people2 = query(conn).value();