Skip to content

Use sqlc.embed to embed a RiverJob row during unique insertion #464

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
brandur merged 1 commit into from
Jul 20, 2024
Merged

Use sqlc.embed to embed a RiverJob row during unique insertion #464

Show file tree
Hide file tree
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
54 changes: 19 additions & 35 deletions riverdriver/riverdatabasesql/internal/dbsqlc/river_job.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 1 addition & 19 deletions riverdriver/riverdatabasesql/river_database_sql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,25 +302,7 @@ func (e *Executor) JobInsertUnique(ctx context.Context, params *riverdriver.JobI
return nil, interpretError(err)
}

jobRow, err := jobRowFromInternal(&dbsqlc.RiverJob{
ID: insertRes.ID,
Args: insertRes.Args,
Attempt: insertRes.Attempt,
AttemptedAt: insertRes.AttemptedAt,
AttemptedBy: insertRes.AttemptedBy,
CreatedAt: insertRes.CreatedAt,
Errors: insertRes.Errors,
FinalizedAt: insertRes.FinalizedAt,
Kind: insertRes.Kind,
MaxAttempts: insertRes.MaxAttempts,
Metadata: insertRes.Metadata,
Priority: insertRes.Priority,
Queue: insertRes.Queue,
ScheduledAt: insertRes.ScheduledAt,
State: insertRes.State,
Tags: insertRes.Tags,
UniqueKey: insertRes.UniqueKey,
})
jobRow, err := jobRowFromInternal(&insertRes.RiverJob)
if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion riverdriver/riverpgxv5/internal/dbsqlc/river_job.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ INSERT INTO river_job(
ON CONFLICT (kind, unique_key) WHERE unique_key IS NOT NULL
-- Something needs to be updated for a row to be returned on a conflict.
DO UPDATE SET kind = EXCLUDED.kind
RETURNING *, (xmax != 0) AS unique_skipped_as_duplicate;
RETURNING sqlc.embed(river_job), (xmax != 0) AS unique_skipped_as_duplicate;

-- Run by the rescuer to queue for retry or discard depending on job state.
-- name: JobRescueMany :exec
Expand Down
54 changes: 19 additions & 35 deletions riverdriver/riverpgxv5/internal/dbsqlc/river_job.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 1 addition & 19 deletions riverdriver/riverpgxv5/river_pgx_v5_driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,25 +296,7 @@ func (e *Executor) JobInsertUnique(ctx context.Context, params *riverdriver.JobI
return nil, interpretError(err)
}

jobRow, err := jobRowFromInternal(&dbsqlc.RiverJob{
ID: insertRes.ID,
Args: insertRes.Args,
Attempt: insertRes.Attempt,
AttemptedAt: insertRes.AttemptedAt,
AttemptedBy: insertRes.AttemptedBy,
CreatedAt: insertRes.CreatedAt,
Errors: insertRes.Errors,
FinalizedAt: insertRes.FinalizedAt,
Kind: insertRes.Kind,
MaxAttempts: insertRes.MaxAttempts,
Metadata: insertRes.Metadata,
Priority: insertRes.Priority,
Queue: insertRes.Queue,
ScheduledAt: insertRes.ScheduledAt,
State: insertRes.State,
Tags: insertRes.Tags,
UniqueKey: insertRes.UniqueKey,
})
jobRow, err := jobRowFromInternal(&insertRes.RiverJob)
if err != nil {
return nil, err
}
Expand Down