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

Only add join args if join was added

Browse source
This commit is contained in:
WithoutPants 2025-12-05 16:49:02 +11:00
parent 8e10798fc4
commit 7d96169796
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkg/sqlite/filter.go
View file

@ -127,9 +127,9 @@ func (j join) toSQL() string {
type joins []join
func (j *joins) add(newJoins ...join) {
// only add if not already joined
for _, newJoin := range newJoins {
// addUnique only adds if not already present
// returns true if added
func (j *joins) addUnique(newJoin join) bool {
found := false
for _, jj := range *j {
if jj.equals(newJoin) {
@ -141,6 +141,13 @@ func (j *joins) add(newJoins ...join) {
if !found {
*j = append(*j, newJoin)
}
return !found
}
func (j *joins) add(newJoins ...join) {
// only add if not already joined
for _, newJoin := range newJoins {
j.addUnique(newJoin)
}
}

3
pkg/sqlite/query.go
View file

@ -132,10 +132,11 @@ func (qb *queryBuilder) join(table, as, onClause string) {
}
func (qb *queryBuilder) addJoins(joins ...join) {
qb.joins.add(joins...)
for _, j := range joins {
if qb.joins.addUnique(j) {
qb.args = append(qb.args, j.args...)
}
}
}
func (qb *queryBuilder) addFilter(f *filterBuilder) error {