From 3fbb3cde347a7df9325a6d9aca5c84c2df287705 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@blender.org>
Date: Sun, 3 Mar 2024 20:54:43 +0100
Subject: [PATCH] Manager: SQLC rename `Uuid` to `UUID`

No functional changes.
---
 internal/manager/persistence/jobs.go           | 6 +++---
 internal/manager/persistence/sqlc/models.go    | 8 ++++----
 internal/manager/persistence/sqlc/query.sql.go | 8 ++++----
 sqlc.yaml                                      | 2 ++
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/internal/manager/persistence/jobs.go b/internal/manager/persistence/jobs.go
index 5d7ede83..8075f77b 100644
--- a/internal/manager/persistence/jobs.go
+++ b/internal/manager/persistence/jobs.go
@@ -742,7 +742,7 @@ func convertSqlcJob(job sqlc.Job) (*Job, error) {
 			CreatedAt: job.CreatedAt,
 			UpdatedAt: job.UpdatedAt.Time,
 		},
-		UUID:              job.Uuid,
+		UUID:              job.UUID,
 		Name:              job.Name,
 		JobType:           job.JobType,
 		Priority:          int(job.Priority),
@@ -755,11 +755,11 @@ func convertSqlcJob(job sqlc.Job) (*Job, error) {
 	}
 
 	if err := json.Unmarshal(job.Settings, &dbJob.Settings); err != nil {
-		return nil, jobError(err, fmt.Sprintf("job %s has invalid settings: %v", job.Uuid, err))
+		return nil, jobError(err, fmt.Sprintf("job %s has invalid settings: %v", job.UUID, err))
 	}
 
 	if err := json.Unmarshal(job.Metadata, &dbJob.Metadata); err != nil {
-		return nil, jobError(err, fmt.Sprintf("job %s has invalid metadata: %v", job.Uuid, err))
+		return nil, jobError(err, fmt.Sprintf("job %s has invalid metadata: %v", job.UUID, err))
 	}
 
 	if job.WorkerTagID.Valid {
diff --git a/internal/manager/persistence/sqlc/models.go b/internal/manager/persistence/sqlc/models.go
index c5845f3b..d57a5b64 100644
--- a/internal/manager/persistence/sqlc/models.go
+++ b/internal/manager/persistence/sqlc/models.go
@@ -14,7 +14,7 @@ type Job struct {
 	ID                      int64
 	CreatedAt               time.Time
 	UpdatedAt               sql.NullTime
-	Uuid                    string
+	UUID                    string
 	Name                    string
 	JobType                 string
 	Priority                int64
@@ -58,7 +58,7 @@ type Task struct {
 	ID            int64
 	CreatedAt     time.Time
 	UpdatedAt     sql.NullTime
-	Uuid          string
+	UUID          string
 	Name          string
 	Type          string
 	JobID         int64
@@ -85,7 +85,7 @@ type Worker struct {
 	ID                 int64
 	CreatedAt          time.Time
 	UpdatedAt          sql.NullTime
-	Uuid               string
+	UUID               string
 	Secret             string
 	Name               string
 	Address            string
@@ -104,7 +104,7 @@ type WorkerTag struct {
 	ID          int64
 	CreatedAt   time.Time
 	UpdatedAt   sql.NullTime
-	Uuid        string
+	UUID        string
 	Name        string
 	Description string
 }
diff --git a/internal/manager/persistence/sqlc/query.sql.go b/internal/manager/persistence/sqlc/query.sql.go
index caec9700..10644a5b 100644
--- a/internal/manager/persistence/sqlc/query.sql.go
+++ b/internal/manager/persistence/sqlc/query.sql.go
@@ -31,7 +31,7 @@ VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )
 
 type CreateJobParams struct {
 	CreatedAt               time.Time
-	Uuid                    string
+	UUID                    string
 	Name                    string
 	JobType                 string
 	Priority                int64
@@ -46,7 +46,7 @@ type CreateJobParams struct {
 func (q *Queries) CreateJob(ctx context.Context, arg CreateJobParams) error {
 	_, err := q.db.ExecContext(ctx, createJob,
 		arg.CreatedAt,
-		arg.Uuid,
+		arg.UUID,
 		arg.Name,
 		arg.JobType,
 		arg.Priority,
@@ -80,7 +80,7 @@ func (q *Queries) FetchJob(ctx context.Context, uuid string) (Job, error) {
 		&i.ID,
 		&i.CreatedAt,
 		&i.UpdatedAt,
-		&i.Uuid,
+		&i.UUID,
 		&i.Name,
 		&i.JobType,
 		&i.Priority,
@@ -107,7 +107,7 @@ func (q *Queries) FetchTask(ctx context.Context, uuid string) (Task, error) {
 		&i.ID,
 		&i.CreatedAt,
 		&i.UpdatedAt,
-		&i.Uuid,
+		&i.UUID,
 		&i.Name,
 		&i.Type,
 		&i.JobID,
diff --git a/sqlc.yaml b/sqlc.yaml
index d99d8136..a01807b0 100644
--- a/sqlc.yaml
+++ b/sqlc.yaml
@@ -11,3 +11,5 @@ sql:
             go_type:
               import: "encoding/json"
               type: "RawMessage"
+        rename:
+          uuid: "UUID"