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

) Follows up #451 with a significant code quality improvement in which we can use `sqlc.embed` (which TIL about) to embed a `RiverJob` row directly on the returned struct, which means we can use our normal `jobRowFromInternal` to map it to a driver result instead of having to manually construct `RiverJob` property by property. Tipped off to the existence of `sqlc.embed` by @tadejsv [1]. Thank you! [1] #451 (comment)
riverqueue · Jul 20, 2024 · 3a4a06d · 3a4a06d
1 parent 439c789
commit 3a4a06d
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 109 deletions.
diff --git a/riverdriver/riverdatabasesql/internal/dbsqlc/river_job.sql.go b/riverdriver/riverdatabasesql/internal/dbsqlc/river_job.sql.go
diff --git a/riverdriver/riverdatabasesql/river_database_sql.go b/riverdriver/riverdatabasesql/river_database_sql.go
@@ -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
 	}

diff --git a/riverdriver/riverpgxv5/internal/dbsqlc/river_job.sql b/riverdriver/riverpgxv5/internal/dbsqlc/river_job.sql
@@ -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

diff --git a/riverdriver/riverpgxv5/internal/dbsqlc/river_job.sql.go b/riverdriver/riverpgxv5/internal/dbsqlc/river_job.sql.go
diff --git a/riverdriver/riverpgxv5/river_pgx_v5_driver.go b/riverdriver/riverpgxv5/river_pgx_v5_driver.go
@@ -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
 	}