Skip to content

Commit 9451ded

Browse files
authored
consolidate JobDeleteMany logic (#1029)
These two methods are identical aside from how they extract the executor and we want to keep them that way, so use the pattern we do elsewhere by putting all other logic in an unexported method they both call.
1 parent 2e097a8 commit 9451ded

1 file changed

Lines changed: 6 additions & 17 deletions

File tree

client.go

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2137,22 +2137,7 @@ func (c *Client[TTx]) JobDeleteMany(ctx context.Context, params *JobDeleteManyPa
21372137
return nil, errNoDriverDBPool
21382138
}
21392139

2140-
if params == nil {
2141-
params = NewJobDeleteManyParams()
2142-
}
2143-
params.schema = c.config.Schema
2144-
2145-
listParams, err := dblist.JobMakeDriverParams(ctx, params.toDBParams(), c.driver.SQLFragmentColumnIn)
2146-
if err != nil {
2147-
return nil, err
2148-
}
2149-
2150-
jobs, err := c.driver.GetExecutor().JobDeleteMany(ctx, (*riverdriver.JobDeleteManyParams)(listParams))
2151-
if err != nil {
2152-
return nil, err
2153-
}
2154-
2155-
return &JobDeleteManyResult{Jobs: jobs}, nil
2140+
return c.jobDeleteMany(ctx, c.driver.GetExecutor(), params)
21562141
}
21572142

21582143
// JobDeleteManyTx deletes many jobs at once based on the conditions defined by
@@ -2164,6 +2149,10 @@ func (c *Client[TTx]) JobDeleteMany(ctx context.Context, params *JobDeleteManyPa
21642149
// // handle error
21652150
// }
21662151
func (c *Client[TTx]) JobDeleteManyTx(ctx context.Context, tx TTx, params *JobDeleteManyParams) (*JobDeleteManyResult, error) {
2152+
return c.jobDeleteMany(ctx, c.driver.UnwrapExecutor(tx), params)
2153+
}
2154+
2155+
func (c *Client[TTx]) jobDeleteMany(ctx context.Context, exec riverdriver.Executor, params *JobDeleteManyParams) (*JobDeleteManyResult, error) {
21672156
if params == nil {
21682157
params = NewJobDeleteManyParams()
21692158
}
@@ -2174,7 +2163,7 @@ func (c *Client[TTx]) JobDeleteManyTx(ctx context.Context, tx TTx, params *JobDe
21742163
return nil, err
21752164
}
21762165

2177-
jobs, err := c.driver.UnwrapExecutor(tx).JobDeleteMany(ctx, (*riverdriver.JobDeleteManyParams)(listParams))
2166+
jobs, err := exec.JobDeleteMany(ctx, (*riverdriver.JobDeleteManyParams)(listParams))
21782167
if err != nil {
21792168
return nil, err
21802169
}

0 commit comments

Comments
 (0)