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

Fix update duplicate ids (#2965)

Browse source
This commit is contained in:
WithoutPants 2022-09-30 18:44:37 +10:00 committed by GitHub
parent 51f4dd8a59
commit 9e44e13f6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 66 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
pkg/sqlite/scene_test.go
View file

@ -739,6 +739,22 @@ func Test_sceneQueryBuilder_UpdatePartialRelationships(t *testing.T) {
},
false,
},
{
"add identical galleries",
sceneIDs[sceneIdxWithGallery],
models.ScenePartial{
GalleryIDs: &models.UpdateIDs{
IDs: []int{galleryIDs[galleryIdx1WithImage], galleryIDs[galleryIdx1WithImage]},
Mode: models.RelationshipUpdateModeAdd,
},
},
models.Scene{
GalleryIDs: models.NewRelatedIDs(append(indexesToIDs(galleryIDs, sceneGalleries[sceneIdxWithGallery]),
galleryIDs[galleryIdx1WithImage],
)),
},
false,
},
{
"add tags",
sceneIDs[sceneIdxWithTwoTags],
@ -759,6 +775,25 @@ func Test_sceneQueryBuilder_UpdatePartialRelationships(t *testing.T) {
},
false,
},
{
"add identical tags",
sceneIDs[sceneIdxWithTwoTags],
models.ScenePartial{
TagIDs: &models.UpdateIDs{
IDs: []int{tagIDs[tagIdx1WithDupName], tagIDs[tagIdx1WithDupName]},
Mode: models.RelationshipUpdateModeAdd,
},
},
models.Scene{
TagIDs: models.NewRelatedIDs(append(
[]int{
tagIDs[tagIdx1WithDupName],
},
indexesToIDs(tagIDs, sceneTags[sceneIdxWithTwoTags])...,
)),
},
false,
},
{
"add performers",
sceneIDs[sceneIdxWithTwoPerformers],
@ -776,6 +811,22 @@ func Test_sceneQueryBuilder_UpdatePartialRelationships(t *testing.T) {
},
false,
},
{
"add identical performers",
sceneIDs[sceneIdxWithTwoPerformers],
models.ScenePartial{
PerformerIDs: &models.UpdateIDs{
IDs: []int{performerIDs[performerIdx1WithDupName], performerIDs[performerIdx1WithDupName]},
Mode: models.RelationshipUpdateModeAdd,
},
},
models.Scene{
PerformerIDs: models.NewRelatedIDs(append(indexesToIDs(performerIDs, scenePerformers[sceneIdxWithTwoPerformers]),
performerIDs[performerIdx1WithDupName],
)),
},
false,
},
{
"add movies",
sceneIDs[sceneIdxWithMovie],

28
pkg/sqlite/table.go
View file

@ -179,21 +179,23 @@ func (t *joinTable) get(ctx context.Context, id int) ([]int, error) {
return ret, nil
}
func (t *joinTable) insertJoin(ctx context.Context, id, foreignID int) (sql.Result, error) {
q := dialect.Insert(t.table.table).Cols(t.idColumn.GetCol(), t.fkColumn.GetCol()).Vals(
goqu.Vals{id, foreignID},
)
ret, err := exec(ctx, q)
if err != nil {
return nil, fmt.Errorf("inserting into %s: %w", t.table.table.GetTable(), err)
}
return ret, nil
}
func (t *joinTable) insertJoins(ctx context.Context, id int, foreignIDs []int) error {
// manually create SQL so that we can prepare once
// ignore duplicates
q := fmt.Sprintf("INSERT INTO %s (%s, %s) VALUES (?, ?) ON CONFLICT (%[2]s, %s) DO NOTHING", t.table.table.GetTable(), t.idColumn.GetCol(), t.fkColumn.GetCol())
tx := dbWrapper{}
stmt, err := tx.Prepare(ctx, q)
if err != nil {
return err
}
defer stmt.Close()
// eliminate duplicates
foreignIDs = intslice.IntAppendUniques(nil, foreignIDs)
for _, fk := range foreignIDs {
if _, err := t.insertJoin(ctx, id, fk); err != nil {
if _, err := tx.ExecStmt(ctx, stmt, id, fk); err != nil {
return err
}
}