Skip to content

consolidate JobDeleteMany logic #1029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bgentry merged 1 commit into from
Sep 7, 2025
Merged

consolidate JobDeleteMany logic #1029

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 6 additions & 17 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2137,22 +2137,7 @@ func (c *Client[TTx]) JobDeleteMany(ctx context.Context, params *JobDeleteManyPa
return nil, errNoDriverDBPool
}

if params == nil {
params = NewJobDeleteManyParams()
}
params.schema = c.config.Schema

listParams, err := dblist.JobMakeDriverParams(ctx, params.toDBParams(), c.driver.SQLFragmentColumnIn)
if err != nil {
return nil, err
}

jobs, err := c.driver.GetExecutor().JobDeleteMany(ctx, (*riverdriver.JobDeleteManyParams)(listParams))
if err != nil {
return nil, err
}

return &JobDeleteManyResult{Jobs: jobs}, nil
return c.jobDeleteMany(ctx, c.driver.GetExecutor(), params)
}

// JobDeleteManyTx deletes many jobs at once based on the conditions defined by
Expand All @@ -2164,6 +2149,10 @@ func (c *Client[TTx]) JobDeleteMany(ctx context.Context, params *JobDeleteManyPa
// // handle error
// }
func (c *Client[TTx]) JobDeleteManyTx(ctx context.Context, tx TTx, params *JobDeleteManyParams) (*JobDeleteManyResult, error) {
return c.jobDeleteMany(ctx, c.driver.UnwrapExecutor(tx), params)
}

func (c *Client[TTx]) jobDeleteMany(ctx context.Context, exec riverdriver.Executor, params *JobDeleteManyParams) (*JobDeleteManyResult, error) {
if params == nil {
params = NewJobDeleteManyParams()
}
Expand All @@ -2174,7 +2163,7 @@ func (c *Client[TTx]) JobDeleteManyTx(ctx context.Context, tx TTx, params *JobDe
return nil, err
}

jobs, err := c.driver.UnwrapExecutor(tx).JobDeleteMany(ctx, (*riverdriver.JobDeleteManyParams)(listParams))
jobs, err := exec.JobDeleteMany(ctx, (*riverdriver.JobDeleteManyParams)(listParams))
if err != nil {
return nil, err
}
Expand Down
Loading