diff --git a/pkg/manager/task_autotag_test.go b/pkg/manager/task_autotag_test.go index ab86058ce..ae60f9d21 100644 --- a/pkg/manager/task_autotag_test.go +++ b/pkg/manager/task_autotag_test.go @@ -21,7 +21,7 @@ import ( "github.com/jmoiron/sqlx" ) -const testName = "Foo Bar" +const testName = "Foo's Bar" const testExtension = ".mp4" var testSeparators = []string{ diff --git a/pkg/models/querybuilder_scene.go b/pkg/models/querybuilder_scene.go index 621101b43..9ceff6ad1 100644 --- a/pkg/models/querybuilder_scene.go +++ b/pkg/models/querybuilder_scene.go @@ -293,7 +293,9 @@ func getMultiCriterionClause(table string, joinTable string, joinTableField stri func (qb *SceneQueryBuilder) QueryAllByPathRegex(regex string) ([]*Scene, error) { var args []interface{} - body := selectDistinctIDs("scenes") + " WHERE scenes.path regexp '(?i)" + regex + "'" + body := selectDistinctIDs("scenes") + " WHERE scenes.path regexp ?" + + args = append(args, "(?i)"+regex) idsResult, err := runIdsQuery(body, args) @@ -326,7 +328,8 @@ func (qb *SceneQueryBuilder) QueryByPathRegex(findFilter *FindFilterType) ([]*Sc body := selectDistinctIDs("scenes") if q := findFilter.Q; q != nil && *q != "" { - whereClauses = append(whereClauses, "scenes.path regexp '(?i)"+*q+"'") + whereClauses = append(whereClauses, "scenes.path regexp ?") + args = append(args, "(?i)"+*q) } sortAndPagination := qb.getSceneSort(findFilter) + getPagination(findFilter)