Backup_Repos/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-06 16:34:02 +01:00
Code Issues Projects Releases Wiki Activity

Fix groups not transferring when merging tags (#6127)

Browse source 
* Add test for group when merging tags
* Fix groups not reallocated when merging tags
This commit is contained in:
WithoutPants 2025-10-13 13:13:23 +11:00 committed by GitHub
parent 2ed9e5332d
commit 72c9c436be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkg/sqlite/tag.go
View file

@ -790,6 +790,7 @@ func (qb *TagStore) Merge(ctx context.Context, source []int, destination int) er
imagesTagsTable: imageIDColumn, imagesTagsTable: imageIDColumn,
"performers_tags": "performer_id", "performers_tags": "performer_id",
"studios_tags": "studio_id", "studios_tags": "studio_id",
groupsTagsTable: "group_id",
} }
args = append(args, destination) args = append(args, destination)

14
pkg/sqlite/tag_test.go
View file

@ -931,6 +931,8 @@ func TestTagMerge(t *testing.T) {
tagIdxWithGallery, tagIdxWithGallery,
tagIdx1WithGallery, tagIdx1WithGallery,
tagIdx2WithGallery, tagIdx2WithGallery,
tagIdx1WithGroup,
tagIdx2WithGroup,
} }
var srcIDs []int var srcIDs []int
for _, idx := range srcIdxs { for _, idx := range srcIdxs {
@ -1024,6 +1026,18 @@ func TestTagMerge(t *testing.T) {
assert.Contains(studioTagIDs, destID) assert.Contains(studioTagIDs, destID)
// ensure group points to new tag
group, err := db.Group.Find(ctx, groupIDs[groupIdxWithTwoTags])
if err != nil {
return err
}
if err := group.LoadTagIDs(ctx, db.Group); err != nil {
return err
}
groupTagIDs := group.TagIDs.List()
assert.Contains(groupTagIDs, destID)
return nil return nil
}); err != nil { }); err != nil {
t.Error(err.Error()) t.Error(err.Error())