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

Error reliably on invalid filter (#3428)

Browse Source
This commit is contained in:
DingDongSoLong4
2023-02-13 03:14:41 +02:00
committed by GitHub
parent ca38a355d2
commit 83cb51ec47
10 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/sqlite/query.go
View File

@@ -22,8 +22,6 @@ type queryBuilder struct {
recursiveWith bool
sortAndPagination string
err error
}
func (qb queryBuilder) body() string {
@@ -61,20 +59,11 @@ func (qb queryBuilder) findIDs(ctx context.Context) ([]int, error) {
}
func (qb queryBuilder) executeFind(ctx context.Context) ([]int, int, error) {
if qb.err != nil {
return nil, 0, qb.err
}
body := qb.body()
return qb.repository.executeFindQuery(ctx, body, qb.args, qb.sortAndPagination, qb.whereClauses, qb.havingClauses, qb.withClauses, qb.recursiveWith)
}
func (qb queryBuilder) executeCount(ctx context.Context) (int, error) {
if qb.err != nil {
return 0, qb.err
}
body := qb.body()
withClause := ""
@@ -136,11 +125,10 @@ func (qb *queryBuilder) addJoins(joins ...join) {
qb.joins.add(joins...)
}
func (qb *queryBuilder) addFilter(f *filterBuilder) {
func (qb *queryBuilder) addFilter(f *filterBuilder) error {
err := f.getError()
if err != nil {
qb.err = err
return
return err
}
clause, args := f.generateWithClauses()
@@ -172,6 +160,8 @@ func (qb *queryBuilder) addFilter(f *filterBuilder) {
}
qb.addJoins(f.getAllJoins()...)
return nil
}
func (qb *queryBuilder) parseQueryString(columns []string, q string) {