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

Fix scene marker sort by scene updated SQL error (#1777)

Browse Source
This commit is contained in:
WithoutPants
2021-09-27 12:26:38 +10:00
committed by GitHub
parent be94e52f21
commit b957a87a78
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/sqlite/scene_marker.go
View File

@@ -3,6 +3,7 @@ package sqlite
import (
"database/sql"
"fmt"
"github.com/stashapp/stash/pkg/database"
"github.com/stashapp/stash/pkg/models"
)
@@ -159,7 +160,7 @@ func (qb *sceneMarkerQueryBuilder) Query(sceneMarkerFilter *models.SceneMarkerFi
query.addFilter(filter)
query.sortAndPagination = qb.getSceneMarkerSort(findFilter) + getPagination(findFilter)
query.sortAndPagination = qb.getSceneMarkerSort(&query, findFilter) + getPagination(findFilter)
idsResult, countResult, err := query.executeFind()
if err != nil {
return nil, 0, err
@@ -246,13 +247,15 @@ func sceneMarkerPerformersCriterionHandler(qb *sceneMarkerQueryBuilder, performe
}
}
func (qb *sceneMarkerQueryBuilder) getSceneMarkerSort(findFilter *models.FindFilterType) string {
func (qb *sceneMarkerQueryBuilder) getSceneMarkerSort(query *queryBuilder, findFilter *models.FindFilterType) string {
sort := findFilter.GetSort("title")
direction := findFilter.GetDirection()
tableName := "scene_markers"
if sort == "scenes_updated_at" {
// ensure scene table is joined
query.join(sceneTable, "", "scenes.id = scene_markers.scene_id")
sort = "updated_at"
tableName = "scene"
tableName = "scenes"
}
return getSort(sort, direction, tableName)
}