mirror of https://github.com/stashapp/stash.git
Fix scene marker query (#5014)
This commit is contained in:
parent
593207866f
commit
3156191b83
|
@ -301,6 +301,7 @@ func (qb *SceneMarkerStore) makeQuery(ctx context.Context, sceneMarkerFilter *mo
|
|||
distinctIDs(&query, sceneMarkerTable)
|
||||
|
||||
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")
|
||||
searchColumns := []string{"scene_markers.title", "scenes.title", "tags.name"}
|
||||
query.parseQueryString(searchColumns, *q)
|
||||
|
|
|
@ -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) {
|
||||
withTxn(func(ctx context.Context) error {
|
||||
sort := "scenes_updated_at"
|
||||
|
|
Loading…
Reference in New Issue