When an artist is referred to using several names, pick first the one set in the artist info file, and fallback on the most recent release, ref #731

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

@@ -334,6 +334,31 @@ AND NOT EXISTS (
         return utils::fetchQuerySingleResult(session.getDboSession()->query<int>("SELECT 1 FROM artist").where("id = ?").bind(id)) == 1;
     }
 
+    RangeResults<Artist::pointer> Artist::findWithMBIDNameVariants(Session& session, ArtistId& lastRetrievedArtist, std::optional<Range> range)
+    {
+        session.checkReadTransaction();
+
+        auto query{ session.getDboSession()->query<Wt::Dbo::ptr<Artist>>(R"(
+        SELECT a FROM artist a 
+        WHERE a.id IN (
+            SELECT t_a_l.artist_id 
+            FROM track_artist_link t_a_l 
+            WHERE t_a_l.artist_mbid_matched = 1 
+            GROUP BY t_a_l.artist_id 
+            HAVING COUNT(DISTINCT t_a_l.artist_name) > 1
+        )
+        AND a.id > ?
+    )")
+                        .bind(lastRetrievedArtist) };
+
+        auto results{ utils::execRangeQuery<Artist::pointer>(query, range) };
+
+        if (!results.results.empty())
+            lastRetrievedArtist = results.results.back()->getId();
+
+        return results;
+    }
+
     void Artist::updatePreferredArtwork(Session& session, ArtistId artistId, ArtworkId artworkId)
     {
         session.checkWriteTransaction();

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

@@ -162,6 +162,7 @@ namespace lms::db
                 query.where("t.track_number = ?").bind(*params.trackNumber);
 
             if (params.sortMethod == TrackSortMethod::DateDescAndRelease
+                || params.sortMethod == TrackSortMethod::OriginalDateDescAndRelease
                 || params.sortMethod == TrackSortMethod::Release)
             {
                 query.join("medium m ON t.medium_id = m.id");
@@ -223,6 +224,9 @@ namespace lms::db
             case TrackSortMethod::DateDescAndRelease:
                 query.orderBy("t.date DESC,t.release_id,m.position,t.track_number");
                 break;
+            case TrackSortMethod::OriginalDateDescAndRelease:
+                query.orderBy("COALESCE(t.original_date, t.date) DESC,t.release_id,m.position,t.track_number");
+                break;
             case TrackSortMethod::Release:
                 query.orderBy("m.position,t.track_number");
                 break;

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

@@ -50,10 +50,22 @@ namespace lms::db
             if (params.artist.isValid())
                 query.where("t_a_l.artist_id = ?").bind(params.artist);
 
-            if (params.release.isValid())
+            if (params.release.isValid()
+                || params.sortMethod == TrackArtistLinkSortMethod::OriginalDateDesc)
             {
                 query.join("track t ON t.id = t_a_l.track_id");
-                query.where("t.release_id = ?").bind(params.release);
+
+                if (params.release.isValid())
+                    query.where("t.release_id = ?").bind(params.release);
+            }
+
+            switch (params.sortMethod)
+            {
+            case TrackArtistLinkSortMethod::None:
+                break;
+            case TrackArtistLinkSortMethod::OriginalDateDesc:
+                query.orderBy("COALESCE(t.original_date, t.date) DESC");
+                break;
             }
 
             return query;
@@ -112,11 +124,8 @@ namespace lms::db
 
     void TrackArtistLink::find(Session& session, const FindParameters& parameters, const std::function<void(const TrackArtistLink::pointer&)>& func)
     {
-        const auto query{ createQuery(session, parameters) };
-
-        utils::forEachQueryResult(query, [&](const TrackArtistLink::pointer& link) {
-            func(link);
-        });
+        auto query{ createQuery(session, parameters) };
+        utils::forEachQueryRangeResult(query, parameters.range, func);
     }
 
     core::EnumSet<TrackArtistLinkType> TrackArtistLink::findUsedTypes(Session& session, ArtistId artistId)