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

Fix scene marker query (#5014)

Browse source
This commit is contained in:
WithoutPants 2024-06-24 16:02:46 +10:00 committed by GitHub
parent 593207866f
commit 3156191b83
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkg/sqlite/scene_marker.go
View file

@ -301,6 +301,7 @@ func (qb *SceneMarkerStore) makeQuery(ctx context.Context, sceneMarkerFilter *mo
distinctIDs(&query, sceneMarkerTable) distinctIDs(&query, sceneMarkerTable)
if q := findFilter.Q; q != nil && *q != "" { if q := findFilter.Q; q != nil && *q != "" {
query.join(sceneTable, "", "scenes.id = scene_markers.scene_id")
query.join(tagTable, "", "scene_markers.primary_tag_id = tags.id") query.join(tagTable, "", "scene_markers.primary_tag_id = tags.id")
searchColumns := []string{"scene_markers.title", "scenes.title", "tags.name"} searchColumns := []string{"scene_markers.title", "scenes.title", "tags.name"}
query.parseQueryString(searchColumns, *q) query.parseQueryString(searchColumns, *q)

21
pkg/sqlite/scene_marker_test.go
View file

@ -74,6 +74,27 @@ func TestMarkerCountByTagID(t *testing.T) {
}) })
} }
func TestMarkerQueryQ(t *testing.T) {
withTxn(func(ctx context.Context) error {
q := getSceneTitle(sceneIdxWithMarkers)
m, _, err := db.SceneMarker.Query(ctx, nil, &models.FindFilterType{
Q: &q,
})
if err != nil {
t.Errorf("Error querying scene markers: %s", err.Error())
}
if !assert.Greater(t, len(m), 0) {
return nil
}
assert.Equal(t, sceneIDs[sceneIdxWithMarkers], m[0].SceneID)
return nil
})
}
func TestMarkerQuerySortBySceneUpdated(t *testing.T) { func TestMarkerQuerySortBySceneUpdated(t *testing.T) {
withTxn(func(ctx context.Context) error { withTxn(func(ctx context.Context) error {
sort := "scenes_updated_at" sort := "scenes_updated_at"