Chaned the way the inner dbo session is accessed + added exec wrappers for queries

src/libs/database/impl/TrackBookmark.cpp

@@ -35,43 +35,41 @@ namespace lms::db
 
     TrackBookmark::pointer TrackBookmark::create(Session& session, ObjectPtr<User> user, ObjectPtr<Track> track)
     {
-        return session.getDboSession().add(std::unique_ptr<TrackBookmark> {new TrackBookmark{ user, track }});
+        return session.getDboSession()->add(std::unique_ptr<TrackBookmark> {new TrackBookmark{ user, track }});
     }
 
     std::size_t TrackBookmark::getCount(Session& session)
     {
         session.checkReadTransaction();
 
-        return session.getDboSession().query<int>("SELECT COUNT(*) FROM track_bookmark");
+        return utils::execSingleResultQuery(session.getDboSession()->query<int>("SELECT COUNT(*) FROM track_bookmark"));
     }
 
     RangeResults<TrackBookmarkId> TrackBookmark::find(Session& session, UserId userId, std::optional<Range> range)
     {
         session.checkReadTransaction();
 
-        auto query{ session.getDboSession().query<TrackBookmarkId>("SELECT id from track_bookmark")
+        auto query{ session.getDboSession()->query<TrackBookmarkId>("SELECT id from track_bookmark")
                     .where("user_id = ?").bind(userId) };
 
-        return utils::execQuery<TrackBookmarkId>(query, range);
+        return utils::execRangeQuery<TrackBookmarkId>(query, range);
     }
 
     TrackBookmark::pointer TrackBookmark::find(Session& session, UserId userId, TrackId trackId)
     {
         session.checkReadTransaction();
 
-        return session.getDboSession().find<TrackBookmark>()
+        return utils::execSingleResultQuery(session.getDboSession()->find<TrackBookmark>()
             .where("user_id = ?").bind(userId)
-            .where("track_id = ?").bind(trackId)
-            .resultValue();
+            .where("track_id = ?").bind(trackId));
     }
 
     TrackBookmark::pointer TrackBookmark::find(Session& session, TrackBookmarkId id)
     {
         session.checkReadTransaction();
 
-        return session.getDboSession().find<TrackBookmark>()
-            .where("id = ?").bind(id)
-            .resultValue();
+        return utils::execSingleResultQuery(session.getDboSession()->find<TrackBookmark>()
+            .where("id = ?").bind(id));
     }
 
 } // namespace lms::db