Reduced includes

src/libs/database/impl/Migration.cpp

@@ -26,7 +26,6 @@
 #include "core/ITraceLogger.hpp"
 #include "database/Session.hpp"
 #include "database/objects/ScanSettings.hpp"
-#include "database/objects/User.hpp"
 
 #include "Db.hpp"
 #include "Utils.hpp"

src/libs/database/impl/Session.cpp

@@ -19,6 +19,8 @@
 
 #include "database/Session.hpp"
 
+#include <Wt/Dbo/WtSqlTraits.h>
+
 #include "core/ILogger.hpp"
 #include "core/ITraceLogger.hpp"
 #include "database/objects/Artist.hpp"

src/libs/database/impl/objects/Artist.cpp

@@ -18,6 +18,7 @@
  */
 #include "database/objects/Artist.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/ILogger.hpp"
@@ -26,13 +27,17 @@
 #include "database/objects/Cluster.hpp"
 #include "database/objects/Directory.hpp"
 #include "database/objects/Release.hpp"
+#include "database/objects/StarredArtist.hpp"
 #include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
 #include "database/objects/User.hpp"
 
 #include "SqlQuery.hpp"
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::Artist)
+
 namespace lms::db
 {
     namespace

src/libs/database/impl/objects/ArtistInfo.cpp

@@ -19,6 +19,7 @@
 
 #include "database/objects/ArtistInfo.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -30,6 +31,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/PathTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::ArtistInfo)
+
 namespace lms::db
 {
     ArtistInfo::pointer ArtistInfo::create(Session& session)

src/libs/database/impl/objects/Artwork.cpp

@@ -19,6 +19,7 @@
 
 #include "database/objects/Artwork.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -29,6 +30,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/PathTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::Artwork)
+
 namespace lms::db
 {
     Artwork::Artwork(ObjectPtr<TrackEmbeddedImage> trackEmbeddedImage)

src/libs/database/impl/objects/AuthToken.cpp

@@ -19,6 +19,7 @@
 
 #include "database/objects/AuthToken.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -28,6 +29,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::AuthToken)
+
 namespace lms::db
 {
     AuthToken::AuthToken(std::string_view domain, std::string_view value, const Wt::WDateTime& expiry, std::optional<long> maxUseCount, ObjectPtr<User> user)

src/libs/database/impl/objects/Cluster.cpp

@@ -19,20 +19,27 @@
 
 #include "database/objects/Cluster.hpp"
 
+#include <Wt/Dbo/Impl.h>
+
 #include "database/Session.hpp"
 #include "database/objects/Artist.hpp"
 #include "database/objects/Artwork.hpp"
 #include "database/objects/Directory.hpp"
 #include "database/objects/MediaLibrary.hpp"
 #include "database/objects/Release.hpp"
-#include "database/objects/ScanSettings.hpp"
 #include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackLyrics.hpp"
 
-#include "SqlQuery.hpp"
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::Cluster)
+DBO_INSTANTIATE_TEMPLATES(lms::db::ClusterType)
+
 namespace lms::db
 {
     namespace

src/libs/database/impl/objects/Directory.cpp

@@ -19,6 +19,8 @@
 
 #include "database/objects/Directory.hpp"
 
+#include <Wt/Dbo/Impl.h>
+
 #include "database/Session.hpp"
 #include "database/Types.hpp"
 #include "database/objects/MediaLibrary.hpp"
@@ -27,6 +29,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/PathTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::Directory)
+
 namespace lms::db
 {
     namespace

src/libs/database/impl/objects/Image.cpp

@@ -19,6 +19,7 @@
 
 #include "database/objects/Image.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -29,6 +30,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/PathTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::Image)
+
 namespace lms::db
 {
     namespace

src/libs/database/impl/objects/Listen.cpp

@@ -18,6 +18,10 @@
  */
 
 #include "database/objects/Listen.hpp"
+
+#include <Wt/Dbo/Impl.h>
+#include <Wt/Dbo/WtSqlTraits.h>
+
 #include "database/Session.hpp"
 #include "database/objects/Track.hpp"
 #include "database/objects/User.hpp"
@@ -26,6 +30,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::Listen)
+
 namespace lms::db
 {
     namespace

src/libs/database/impl/objects/MediaLibrary.cpp

@@ -19,8 +19,9 @@
 
 #include "database/objects/MediaLibrary.hpp"
 
+#include <Wt/Dbo/Impl.h>
+
 #include "database/Session.hpp"
-#include "database/objects/ScanSettings.hpp"
 #include "database/objects/Track.hpp"
 
 #include "Utils.hpp"
@@ -28,6 +29,8 @@
 #include "traits/PathTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::MediaLibrary)
+
 namespace lms::db
 {
     MediaLibrary::MediaLibrary(std::string_view name, const std::filesystem::path& p)

src/libs/database/impl/objects/PlayListFile.cpp

@@ -19,12 +19,14 @@
 
 #include "database/objects/PlayListFile.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/ILogger.hpp"
 #include "database/Session.hpp"
 #include "database/objects/Directory.hpp"
 #include "database/objects/MediaLibrary.hpp"
+#include "database/objects/Track.hpp"
 #include "database/objects/TrackList.hpp"
 #include "database/objects/User.hpp"
 
@@ -33,6 +35,8 @@
 #include "traits/PathTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::PlayListFile)
+
 namespace lms::db
 {
     PlayListFile::PlayListFile(const std::filesystem::path& file)

src/libs/database/impl/objects/PlayQueue.cpp

@@ -19,20 +19,29 @@
 
 #include "database/objects/PlayQueue.hpp"
 
-#include <Wt/Dbo/SqlTraits.h>
+#include <Wt/Dbo/Impl.h>
+#include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
+#include "database/objects/Artist.hpp"
 #include "database/objects/Artwork.hpp"
+#include "database/objects/Cluster.hpp"
 #include "database/objects/Directory.hpp"
 #include "database/objects/MediaLibrary.hpp"
 #include "database/objects/Release.hpp"
 #include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackLyrics.hpp"
 #include "database/objects/User.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::PlayQueue)
+
 namespace lms::db
 {
     PlayQueue::PlayQueue(const ObjectPtr<User>& user, std::string_view name)

src/libs/database/impl/objects/RatedArtist.cpp

@@ -19,6 +19,7 @@
 
 #include "database/objects/RatedArtist.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -28,6 +29,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::RatedArtist)
+
 namespace lms::db
 {
     RatedArtist::RatedArtist(ObjectPtr<Artist> artist, ObjectPtr<User> user)

src/libs/database/impl/objects/RatedRelease.cpp

@@ -19,6 +19,7 @@
 
 #include "database/objects/RatedRelease.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -28,6 +29,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::RatedRelease)
+
 namespace lms::db
 {
     RatedRelease::RatedRelease(ObjectPtr<Release> release, ObjectPtr<User> user)

src/libs/database/impl/objects/RatedTrack.cpp

@@ -19,6 +19,7 @@
 
 #include "database/objects/RatedTrack.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -28,6 +29,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::RatedTrack)
+
 namespace lms::db
 {
     RatedTrack::RatedTrack(ObjectPtr<Track> track, ObjectPtr<User> user)

src/libs/database/impl/objects/Release.cpp

@@ -19,6 +19,7 @@
 
 #include "database/objects/Release.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/PartialDateTime.hpp"
@@ -28,7 +29,12 @@
 #include "database/objects/Artwork.hpp"
 #include "database/objects/Cluster.hpp"
 #include "database/objects/Directory.hpp"
+#include "database/objects/MediaLibrary.hpp"
 #include "database/objects/Track.hpp"
+#include "database/objects/TrackArtistLink.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+#include "database/objects/TrackEmbeddedImageLink.hpp"
+#include "database/objects/TrackLyrics.hpp"
 #include "database/objects/User.hpp"
 
 #include "SqlQuery.hpp"
@@ -38,6 +44,11 @@
 #include "traits/PartialDateTimeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::Country)
+DBO_INSTANTIATE_TEMPLATES(lms::db::Label)
+DBO_INSTANTIATE_TEMPLATES(lms::db::Release)
+DBO_INSTANTIATE_TEMPLATES(lms::db::ReleaseType)
+
 namespace lms::db
 {
     namespace

src/libs/database/impl/objects/ScanSettings.cpp

@@ -19,6 +19,7 @@
 
 #include "database/objects/ScanSettings.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/String.hpp"
@@ -29,6 +30,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::ScanSettings)
+
 namespace lms::db
 {
     ScanSettings::ScanSettings(std::string_view name)

src/libs/database/impl/objects/StarredArtist.cpp

@@ -19,6 +19,7 @@
 
 #include "database/objects/StarredArtist.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -28,6 +29,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::StarredArtist)
+
 namespace lms::db
 {
     StarredArtist::StarredArtist(ObjectPtr<Artist> artist, ObjectPtr<User> user, FeedbackBackend backend)

src/libs/database/impl/objects/StarredRelease.cpp

@@ -19,6 +19,7 @@
 
 #include "database/objects/StarredRelease.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -28,6 +29,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::StarredRelease)
+
 namespace lms::db
 {
     StarredRelease::StarredRelease(ObjectPtr<Release> release, ObjectPtr<User> user, FeedbackBackend backend)

src/libs/database/impl/objects/StarredTrack.cpp

@@ -19,6 +19,7 @@
 
 #include "database/objects/StarredTrack.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -28,6 +29,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::StarredTrack)
+
 namespace lms::db
 {
     StarredTrack::StarredTrack(ObjectPtr<Track> track, ObjectPtr<User> user, FeedbackBackend backend)

src/libs/database/impl/objects/Track.cpp

@@ -19,6 +19,7 @@
 
 #include "database/objects/Track.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "core/ILogger.hpp"
@@ -43,6 +44,8 @@
 #include "traits/PathTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::Track)
+
 namespace lms::db
 {
     namespace

src/libs/database/impl/objects/TrackArtistLink.cpp

@@ -19,6 +19,8 @@
 
 #include "database/objects/TrackArtistLink.hpp"
 
+#include <Wt/Dbo/Impl.h>
+
 #include "database/Session.hpp"
 #include "database/objects/Artist.hpp"
 #include "database/objects/Track.hpp"
@@ -26,6 +28,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::TrackArtistLink)
+
 namespace lms::db
 {
     namespace

src/libs/database/impl/objects/TrackBookmark.cpp

@@ -19,6 +19,8 @@
 
 #include "database/objects/TrackBookmark.hpp"
 
+#include <Wt/Dbo/Impl.h>
+
 #include "database/Session.hpp"
 #include "database/objects/Track.hpp"
 #include "database/objects/User.hpp"
@@ -26,6 +28,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::TrackBookmark)
+
 namespace lms::db
 {
     TrackBookmark::TrackBookmark(ObjectPtr<User> user, ObjectPtr<Track> track)

src/libs/database/impl/objects/TrackEmbeddedImage.cpp

@@ -17,17 +17,22 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "database/objects/Directory.hpp"
+#include "database/objects/TrackEmbeddedImage.hpp"
+
+#include <Wt/Dbo/Impl.h>
 
 #include "database/Session.hpp"
 #include "database/Types.hpp"
 #include "database/objects/Track.hpp"
-#include "database/objects/TrackEmbeddedImage.hpp"
+
+#include "database/objects/TrackEmbeddedImageLink.hpp"
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 #include "traits/ImageHashTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::TrackEmbeddedImage)
+
 namespace lms::db
 {
     namespace

src/libs/database/impl/objects/TrackEmbeddedImageLink.cpp

@@ -19,6 +19,9 @@
 
 #include "database/objects/TrackEmbeddedImageLink.hpp"
 
+#include <Wt/Dbo/Impl.h>
+#include <Wt/Dbo/WtSqlTraits.h>
+
 #include "database/Session.hpp"
 #include "database/Types.hpp"
 #include "database/objects/Track.hpp"
@@ -26,6 +29,9 @@
 
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
+#include "traits/ImageHashTypeTraits.hpp"
+
+DBO_INSTANTIATE_TEMPLATES(lms::db::TrackEmbeddedImageLink)
 
 namespace lms::db
 {

src/libs/database/impl/objects/TrackFeatures.cpp

@@ -19,6 +19,7 @@
 
 #include "database/objects/TrackFeatures.hpp"
 
+#include <Wt/Dbo/Impl.h>
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 
@@ -30,6 +31,8 @@
 #include "Utils.hpp"
 #include "traits/IdTypeTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::TrackFeatures)
+
 namespace lms::db
 {
 

src/libs/database/impl/objects/TrackList.cpp

@@ -20,6 +20,9 @@
 
 #include <cassert>
 
+#include <Wt/Dbo/Impl.h>
+#include <Wt/Dbo/WtSqlTraits.h>
+
 #include "database/Session.hpp"
 #include "database/objects/Cluster.hpp"
 #include "database/objects/PlayListFile.hpp"
@@ -31,6 +34,9 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::TrackList)
+DBO_INSTANTIATE_TEMPLATES(lms::db::TrackListEntry)
+
 namespace lms::db
 {
     namespace

src/libs/database/impl/objects/TrackLyrics.cpp

@@ -19,7 +19,7 @@
 
 #include "database/objects/TrackLyrics.hpp"
 
-#include <Wt/Dbo/SqlTraits.h>
+#include <Wt/Dbo/Impl.h>
 #include <Wt/Dbo/WtSqlTraits.h>
 
 #include "database/Session.hpp"
@@ -32,6 +32,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/PathTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::TrackLyrics)
+
 namespace lms::db
 {
     namespace

src/libs/database/impl/objects/UIState.cpp

@@ -19,6 +19,8 @@
 
 #include "database/objects/UIState.hpp"
 
+#include <Wt/Dbo/Impl.h>
+
 #include "database/Session.hpp"
 #include "database/objects/User.hpp"
 
@@ -26,6 +28,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::UIState)
+
 namespace lms::db
 {
     UIState::UIState(std::string_view item, ObjectPtr<User> user)

src/libs/database/impl/objects/User.cpp

@@ -21,8 +21,12 @@
 
 #include <cassert>
 
+#include <Wt/Dbo/Impl.h>
+#include <Wt/Dbo/WtSqlTraits.h>
+
 #include "database/Session.hpp"
 #include "database/objects/Artist.hpp"
+#include "database/objects/AuthToken.hpp"
 #include "database/objects/Release.hpp"
 #include "database/objects/Track.hpp"
 #include "database/objects/UIState.hpp"
@@ -32,6 +36,8 @@
 #include "traits/IdTypeTraits.hpp"
 #include "traits/StringViewTraits.hpp"
 
+DBO_INSTANTIATE_TEMPLATES(lms::db::User)
+
 namespace lms::db
 {
     User::User(std::string_view loginName)

src/libs/database/include/database/objects/Artist.hpp

@@ -25,7 +25,8 @@
 #include <string_view>
 #include <vector>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
 #include <Wt/WDateTime.h>
 
 #include "core/EnumSet.hpp"

src/libs/database/include/database/objects/ArtistInfo.hpp

@@ -24,7 +24,7 @@
 #include <string>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"

src/libs/database/include/database/objects/Artwork.hpp

@@ -21,7 +21,7 @@
 
 #include <filesystem>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"

src/libs/database/include/database/objects/AuthToken.hpp

@@ -22,11 +22,10 @@
 #include <optional>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
-#include "database/Types.hpp"
 #include "database/objects/AuthTokenId.hpp"
 #include "database/objects/UserId.hpp"
 

src/libs/database/include/database/objects/Cluster.hpp

@@ -22,10 +22,10 @@
 #include <optional>
 #include <string>
 #include <string_view>
-#include <tuple>
 #include <vector>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"

src/libs/database/include/database/objects/Directory.hpp

@@ -21,11 +21,12 @@
 
 #include <filesystem>
 #include <functional>
+#include <optional>
 #include <string>
 #include <string_view>
 #include <vector>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 
 #include "core/EnumSet.hpp"
 #include "database/Object.hpp"

src/libs/database/include/database/objects/Image.hpp

@@ -21,8 +21,9 @@
 
 #include <filesystem>
 #include <functional>
+#include <optional>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"

src/libs/database/include/database/objects/Listen.hpp

@@ -21,7 +21,7 @@
 
 #include <optional>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"

src/libs/database/include/database/objects/MediaLibrary.hpp

@@ -24,7 +24,7 @@
 #include <string>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 
 #include "database/Object.hpp"
 #include "database/objects/MediaLibraryId.hpp"

src/libs/database/include/database/objects/PlayListFile.hpp

@@ -24,7 +24,9 @@
 #include <string>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
+#include <Wt/Dbo/weak_ptr.h>
 #include <Wt/WDateTime.h>
 
 #include "database/IdRange.hpp"

src/libs/database/include/database/objects/PlayQueue.hpp

@@ -20,15 +20,14 @@
 #pragma once
 
 #include <chrono>
-#include <span>
 #include <string>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"
-#include "database/Types.hpp"
 #include "database/objects/TrackId.hpp"
 #include "database/objects/UserId.hpp"
 

src/libs/database/include/database/objects/RatedArtist.hpp

@@ -19,7 +19,9 @@
 
 #pragma once
 
-#include <Wt/Dbo/Dbo.h>
+#include <optional>
+
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"

src/libs/database/include/database/objects/RatedRelease.hpp

@@ -19,7 +19,9 @@
 
 #pragma once
 
-#include <Wt/Dbo/Dbo.h>
+#include <optional>
+
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"

src/libs/database/include/database/objects/RatedTrack.hpp

@@ -19,7 +19,9 @@
 
 #pragma once
 
-#include <Wt/Dbo/Dbo.h>
+#include <optional>
+
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"

src/libs/database/include/database/objects/Release.hpp

@@ -24,7 +24,8 @@
 #include <string_view>
 #include <vector>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
 #include <Wt/WDateTime.h>
 
 #include "core/EnumSet.hpp"

src/libs/database/include/database/objects/ScanSettings.hpp

@@ -24,7 +24,7 @@
 #include <string_view>
 #include <vector>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 #include <Wt/WTime.h>
 
 #include "database/IdType.hpp"

src/libs/database/include/database/objects/StarredArtist.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"

src/libs/database/include/database/objects/StarredRelease.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"

src/libs/database/include/database/objects/StarredTrack.hpp

@@ -19,7 +19,9 @@
 
 #pragma once
 
-#include <Wt/Dbo/Dbo.h>
+#include <optional>
+
+#include <Wt/Dbo/Field.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"

src/libs/database/include/database/objects/Track.hpp

@@ -27,8 +27,8 @@
 #include <string_view>
 #include <vector>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
-#include <Wt/Dbo/WtSqlTraits.h>
+#include <Wt/Dbo/collection.h>
 #include <Wt/WDateTime.h>
 
 #include "core/EnumSet.hpp"

src/libs/database/include/database/objects/TrackArtistLink.hpp

@@ -23,7 +23,7 @@
 #include <string>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 
 #include "core/EnumSet.hpp"
 #include "database/IdType.hpp"

src/libs/database/include/database/objects/TrackBookmark.hpp

@@ -22,7 +22,7 @@
 #include <chrono>
 #include <optional>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 
 #include "database/IdType.hpp"
 #include "database/Object.hpp"

src/libs/database/include/database/objects/TrackEmbeddedImage.hpp

@@ -23,7 +23,8 @@
 #include <string>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
 
 #include "core/EnumSet.hpp"
 #include "database/Object.hpp"

src/libs/database/include/database/objects/TrackEmbeddedImageLink.hpp

@@ -22,7 +22,7 @@
 #include <string>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 
 #include "database/Object.hpp"
 #include "database/Types.hpp"

src/libs/database/include/database/objects/TrackFeatures.hpp

@@ -25,7 +25,7 @@
 #include <unordered_set>
 #include <vector>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 
 #include "database/IdType.hpp"
 #include "database/Object.hpp"

src/libs/database/include/database/objects/TrackList.hpp

@@ -24,7 +24,8 @@
 #include <string_view>
 #include <vector>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
 #include <Wt/WDateTime.h>
 
 #include "database/Object.hpp"

src/libs/database/include/database/objects/TrackLyrics.hpp

@@ -22,10 +22,11 @@
 #include <chrono>
 #include <filesystem>
 #include <map>
+#include <optional>
 #include <span>
 #include <string>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
 
 #include "database/IdType.hpp"
 #include "database/Object.hpp"

src/libs/database/include/database/objects/UIState.hpp

@@ -19,11 +19,12 @@
 
 #pragma once
 
-#include <Wt/Dbo/Dbo.h>
+#include <string>
+#include <string_view>
+
+#include <Wt/Dbo/Field.h>
 
-#include "core/String.hpp"
 #include "database/Object.hpp"
-#include "database/Types.hpp"
 #include "database/objects/UIStateId.hpp"
 #include "database/objects/UserId.hpp"
 

src/libs/database/include/database/objects/User.hpp

@@ -22,7 +22,8 @@
 #include <optional>
 #include <string_view>
 
-#include <Wt/Dbo/Dbo.h>
+#include <Wt/Dbo/Field.h>
+#include <Wt/Dbo/collection.h>
 #include <Wt/WDateTime.h>
 
 #include "core/EnumSet.hpp"

src/libs/services/feedback/impl/listenbrainz/FeedbacksSynchronizer.cpp

@@ -21,6 +21,7 @@
 
 #include <Wt/Json/Array.h>
 #include <Wt/Json/Object.h>
+#include <Wt/Json/Parser.h>
 #include <Wt/Json/Serializer.h>
 #include <Wt/Json/Value.h>
 #include <boost/asio/bind_executor.hpp>

src/libs/services/scrobbling/impl/listenbrainz/ListensSynchronizer.cpp

@@ -21,6 +21,7 @@
 
 #include <Wt/Json/Array.h>
 #include <Wt/Json/Object.h>
+#include <Wt/Json/Parser.h>
 #include <Wt/Json/Serializer.h>
 #include <Wt/Json/Value.h>
 #include <boost/asio/bind_executor.hpp>

src/lms/ui/MediaPlayer.cpp

@@ -20,6 +20,7 @@
 #include "MediaPlayer.hpp"
 
 #include <Wt/Json/Object.h>
+#include <Wt/Json/Parser.h>
 #include <Wt/Json/Serializer.h>
 #include <Wt/Json/Value.h>
 #include <Wt/WPushButton.h>