Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 12:24:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix image querying (#2119)

Browse Source 
* Fix image querying
* Add unit tests

Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
This commit is contained in:
InfiniteTF
2021-12-15 03:56:03 +01:00
committed by GitHub
parent d176e9f192
commit b58883c074
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/sqlite/image.go
View File

@@ -360,7 +360,7 @@ func imageIsMissingCriterionHandler(qb *imageQueryBuilder, isMissing *string) cr
qb.performersRepository().join(f, "performers_join", "images.id") qb.performersRepository().join(f, "performers_join", "images.id")
f.addWhere("performers_join.image_id IS NULL") f.addWhere("performers_join.image_id IS NULL")
case "galleries": case "galleries":
qb.galleriesRepository().innerJoin(f, "galleries_join", "images.id") qb.galleriesRepository().join(f, "galleries_join", "images.id")
f.addWhere("galleries_join.image_id IS NULL") f.addWhere("galleries_join.image_id IS NULL")
case "tags": case "tags":
qb.tagsRepository().join(f, "tags_join", "images.id") qb.tagsRepository().join(f, "tags_join", "images.id")
@@ -412,8 +412,8 @@ func imageTagCountCriterionHandler(qb *imageQueryBuilder, tagCount *models.IntCr
func imageGalleriesCriterionHandler(qb *imageQueryBuilder, galleries *models.MultiCriterionInput) criterionHandlerFunc { func imageGalleriesCriterionHandler(qb *imageQueryBuilder, galleries *models.MultiCriterionInput) criterionHandlerFunc {
addJoinsFunc := func(f *filterBuilder) { addJoinsFunc := func(f *filterBuilder) {
qb.galleriesRepository().innerJoin(f, "galleries_join", "images.id") qb.galleriesRepository().join(f, "galleries_join", "images.id")
f.addInnerJoin(galleryTable, "", "galleries_join.gallery_id = galleries.id") f.addLeftJoin(galleryTable, "", "galleries_join.gallery_id = galleries.id")
} }
h := qb.getMultiCriterionHandlerBuilder(galleryTable, galleriesImagesTable, galleryIDColumn, addJoinsFunc) h := qb.getMultiCriterionHandlerBuilder(galleryTable, galleriesImagesTable, galleryIDColumn, addJoinsFunc)

22
pkg/sqlite/image_test.go
View File

@@ -490,6 +490,8 @@ func TestImageQueryIsMissingGalleries(t *testing.T) {
t.Errorf("Error querying image: %s", err.Error()) t.Errorf("Error querying image: %s", err.Error())
} }
assert.Greater(t, len(images), 0)
// ensure non of the ids equal the one with gallery // ensure non of the ids equal the one with gallery
for _, image := range images { for _, image := range images {
assert.NotEqual(t, imageIDs[imageIdxWithGallery], image.ID) assert.NotEqual(t, imageIDs[imageIdxWithGallery], image.ID)
@@ -641,11 +643,7 @@ func TestImageQueryGallery(t *testing.T) {
Galleries: &galleryCriterion, Galleries: &galleryCriterion,
} }
images, _, err := queryImagesWithCount(sqb, &imageFilter, nil) images := queryImages(t, sqb, &imageFilter, nil)
if err != nil {
t.Errorf("Error querying image: %s", err.Error())
}
assert.Len(t, images, 1) assert.Len(t, images, 1)
// ensure ids are correct // ensure ids are correct
@@ -661,10 +659,7 @@ func TestImageQueryGallery(t *testing.T) {
Modifier: models.CriterionModifierIncludesAll, Modifier: models.CriterionModifierIncludesAll,
} }
images, _, err = queryImagesWithCount(sqb, &imageFilter, nil) images = queryImages(t, sqb, &imageFilter, nil)
if err != nil {
t.Errorf("Error querying image: %s", err.Error())
}
assert.Len(t, images, 1) assert.Len(t, images, 1)
assert.Equal(t, imageIDs[imageIdxWithTwoGalleries], images[0].ID) assert.Equal(t, imageIDs[imageIdxWithTwoGalleries], images[0].ID)
@@ -681,12 +676,13 @@ func TestImageQueryGallery(t *testing.T) {
Q: &q, Q: &q,
} }
images, _, err = queryImagesWithCount(sqb, &imageFilter, &findFilter) images = queryImages(t, sqb, &imageFilter, &findFilter)
if err != nil {
t.Errorf("Error querying image: %s", err.Error())
}
assert.Len(t, images, 0) assert.Len(t, images, 0)
q = getImageStringValue(imageIdxWithPerformer, titleField)
images = queryImages(t, sqb, &imageFilter, &findFilter)
assert.Len(t, images, 1)
return nil return nil
}) })
} }

1
pkg/sqlite/repository.go
View File

@@ -297,6 +297,7 @@ func (r *repository) join(j joiner, as string, parentIDCol string) {
j.addLeftJoin(r.tableName, as, fmt.Sprintf("%s.%s = %s", t, r.idColumn, parentIDCol)) j.addLeftJoin(r.tableName, as, fmt.Sprintf("%s.%s = %s", t, r.idColumn, parentIDCol))
} }
//nolint:golint,unused
func (r *repository) innerJoin(j joiner, as string, parentIDCol string) { func (r *repository) innerJoin(j joiner, as string, parentIDCol string) {
t := r.tableName t := r.tableName
if as != "" { if as != "" {