Changed schema to allow multiple releases/artists to share the same image

src/libs/database/impl/Artist.cpp

@@ -277,7 +277,7 @@ namespace lms::db
 
     ObjectPtr<Image> Artist::getImage() const
     {
-        return ObjectPtr<Image>{ _image.lock() };
+        return ObjectPtr<Image>{ _image };
     }
 
     RangeResults<ArtistId> Artist::findSimilarArtistIds(core::EnumSet<TrackArtistLinkType> artistLinkTypes, std::optional<Range> range) const

src/libs/database/impl/Migration.cpp

@@ -35,7 +35,7 @@ namespace lms::db
 {
     namespace
     {
-        static constexpr Version LMS_DATABASE_VERSION{ 68 };
+        static constexpr Version LMS_DATABASE_VERSION{ 69 };
     }
 
     VersionInfo::VersionInfo()
@@ -809,9 +809,72 @@ SELECT
         session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
     }
 
+    void migrateFromV68(Session& session)
+    {
+        // Changed the way we ref images from release and artists (several releases and artist can now share the same image)
+        session.getDboSession()->execute(R"(CREATE TABLE "release_backup" (
+"id" integer primary key autoincrement,
+"version" integer not null,
+"name" text not null,
+"sort_name" text not null,
+"mbid" text not null,
+"group_mbid" text not null,
+"total_disc" integer,
+"artist_display_name" text not null,
+"is_compilation" boolean not null,
+"image_id" bigint,
+constraint "fk_release_image" foreign key ("image_id") references "image" ("id") on delete set null deferrable initially deferred))");
+
+        // Migrate data, with the new image_id field set to null
+        session.getDboSession()->execute(R"(INSERT INTO release_backup 
+SELECT
+ id,
+ version,
+ name,
+ sort_name,
+ mbid,
+ group_mbid,
+ total_disc,
+ artist_display_name,
+ is_compilation,
+ NULL
+ FROM release
+ )");
+        session.getDboSession()->execute("DROP TABLE release");
+        session.getDboSession()->execute("ALTER TABLE release_backup RENAME TO release");
+
+        session.getDboSession()->execute(R"(CREATE TABLE IF NOT EXISTS "artist_backup" (
+  "id" integer primary key autoincrement,
+  "version" integer not null,
+  "name" text not null,
+  "sort_name" text not null,
+  "mbid" text not null,
+  "image_id" bigint,
+  constraint "fk_artist_image" foreign key ("image_id") references "image" ("id") on delete set null deferrable initially deferred
+))");
+
+        // Migrate data, with the new image_id field set to null
+        session.getDboSession()->execute(R"(INSERT INTO artist_backup 
+SELECT
+ id,
+ version,
+ name,
+ sort_name,
+ mbid,
+ NULL
+ FROM artist
+ )");
+
+        session.getDboSession()->execute("DROP TABLE artist");
+        session.getDboSession()->execute("ALTER TABLE artist_backup RENAME TO artist");
+
+        // Just increment the scan version of the settings to make the next scheduled scan rescan everything
+        session.getDboSession()->execute("UPDATE scan_settings SET scan_version = scan_version + 1");
+    }
+
     bool doDbMigration(Session& session)
     {
-        static const std::string outdatedMsg{ "Outdated database, please rebuild it (delete the .db file and restart)" };
+        constexpr std::string_view outdatedMsg{ "Outdated database, please rebuild it (delete the .db file and restart)" };
 
         ScopedNoForeignKeys noPragmaKeys{ session.getDb() };
 
@@ -853,6 +916,7 @@ SELECT
             { 65, migrateFromV65 },
             { 66, migrateFromV66 },
             { 67, migrateFromV67 },
+            { 68, migrateFromV68 },
         };
 
         bool migrationPerformed{};

src/libs/database/impl/Release.cpp

@@ -572,7 +572,7 @@ namespace lms::db
 
     ObjectPtr<Image> Release::getImage() const
     {
-        return ObjectPtr<Image>{ _image.lock() };
+        return ObjectPtr<Image>{ _image };
     }
 
     void Release::clearLabels()

src/libs/database/impl/Session.cpp

@@ -179,6 +179,7 @@ namespace lms::db
 
         auto transaction{ createWriteTransaction() };
         _session.execute("CREATE INDEX IF NOT EXISTS artist_id_idx ON artist(id)");
+        _session.execute("CREATE INDEX IF NOT EXISTS artist_image_idx ON artist(image_id)");
         _session.execute("CREATE INDEX IF NOT EXISTS artist_name_idx ON artist(name)");
         _session.execute("CREATE INDEX IF NOT EXISTS artist_sort_name_nocase_idx ON artist(sort_name COLLATE NOCASE)");
         _session.execute("CREATE INDEX IF NOT EXISTS artist_mbid_idx ON artist(mbid)");
@@ -195,11 +196,9 @@ namespace lms::db
         _session.execute("CREATE INDEX IF NOT EXISTS directory_path_idx ON directory(absolute_path)");
         _session.execute("CREATE INDEX IF NOT EXISTS directory_media_library_idx ON directory(media_library_id)");
 
-        _session.execute("CREATE INDEX IF NOT EXISTS image_artist_idx ON image(artist_id)");
         _session.execute("CREATE INDEX IF NOT EXISTS image_directory_stem_idx ON image(directory_id, stem COLLATE NOCASE)");
         _session.execute("CREATE INDEX IF NOT EXISTS image_id_idx ON image(id)");
         _session.execute("CREATE INDEX IF NOT EXISTS image_path_idx ON image(absolute_file_path)");
-        _session.execute("CREATE INDEX IF NOT EXISTS image_release_idx ON image(release_id)");
         _session.execute("CREATE INDEX IF NOT EXISTS image_stem_idx ON image(stem COLLATE NOCASE)");
 
         _session.execute("CREATE INDEX IF NOT EXISTS label_name_idx ON label(name)");
@@ -218,6 +217,7 @@ namespace lms::db
         _session.execute("CREATE INDEX IF NOT EXISTS rated_track_user_track_idx ON rated_track(user_id,track_id)");
 
         _session.execute("CREATE INDEX IF NOT EXISTS release_id_idx ON release(id)");
+        _session.execute("CREATE INDEX IF NOT EXISTS release_image_idx ON release(image_id)");
         _session.execute("CREATE INDEX IF NOT EXISTS release_mbid_idx ON release(mbid)");
         _session.execute("CREATE INDEX IF NOT EXISTS release_name_idx ON release(name)");
         _session.execute("CREATE INDEX IF NOT EXISTS release_name_nocase_idx ON release(name COLLATE NOCASE)");