Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- Fixed `JobListParams.Where` writing into the first `NamedArgs` it's given when merging multiple sets of named arguments, which could leak arguments into a map the caller reused for another query. It also no longer panics when the first set is `nil`. [PR #1575](https://github.com/riverqueue/river/pull/1575).

## [0.51.1] - 2026-11-05

### Fixed
Expand Down
11 changes: 4 additions & 7 deletions job_list_params.go
Original file line number Diff line number Diff line change
Expand Up @@ -576,14 +576,11 @@ func (p *JobListParams) Where(sql string, namedArgsMany ...NamedArgs) *JobListPa
paramsCopy := p.copy()

var allNamedArgs NamedArgs
if len(namedArgsMany) > 0 {
for i, namedArgs := range namedArgsMany {
if i == 0 {
allNamedArgs = namedArgs
} else {
maps.Copy(allNamedArgs, namedArgs)
}
for _, namedArgs := range namedArgsMany {
if allNamedArgs == nil {
allNamedArgs = make(NamedArgs, len(namedArgs))
}
maps.Copy(allNamedArgs, namedArgs)
}

paramsCopy.where = append(paramsCopy.where, dblist.WherePredicate{NamedArgs: allNamedArgs, SQL: sql})
Expand Down
25 changes: 25 additions & 0 deletions job_list_params_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -636,3 +636,28 @@ func Test_JobListParams_toDBParamsWithoutFinalizedIndex(t *testing.T) {
})
}
}

func TestJobListParams_Where(t *testing.T) {
t.Parallel()

t.Run("MergesNamedArgsWithoutMutatingThem", func(t *testing.T) {
t.Parallel()

var (
namedArgs1 = NamedArgs{"a": 1, "b": 2}
namedArgs2 = NamedArgs{"b": 3}
)

params := NewJobListParams().Where("a = @a AND b = @b", namedArgs1, namedArgs2)
require.Equal(t, map[string]any{"a": 1, "b": 3}, params.where[0].NamedArgs)
require.Equal(t, NamedArgs{"a": 1, "b": 2}, namedArgs1)
require.Equal(t, NamedArgs{"b": 3}, namedArgs2)
})

t.Run("NilFirstNamedArgs", func(t *testing.T) {
t.Parallel()

params := NewJobListParams().Where("a = @a", nil, NamedArgs{"a": 1})
require.Equal(t, map[string]any{"a": 1}, params.where[0].NamedArgs)
})
}
Loading