Skip to content

Commit 3b4df92

Browse files
DanielleMaywoodDanielleMaywood
committed
fix: drop 'RETURNING' from sql
1 parent 621071e commit 3b4df92

File tree

8 files changed

+31
-43
lines changed

8 files changed

+31
-43
lines changed

‎coderd/agentapi/scripts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func (s *ScriptsAPI) ScriptCompleted(ctx context.Context, req *agentproto.Worksp
3232
stage = database.WorkspaceAgentScriptTimingStageCron
3333
}
3434

35-
_, err = s.Database.InsertWorkspaceAgentScriptTimings(ctx, database.InsertWorkspaceAgentScriptTimingsParams{
35+
err = s.Database.InsertWorkspaceAgentScriptTimings(ctx, database.InsertWorkspaceAgentScriptTimingsParams{
3636
ScriptID: scriptID,
3737
Stage: stage,
3838
DisplayName: req.Timing.DisplayName,

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3027,9 +3027,9 @@ func (q *querier) InsertWorkspaceAgentMetadata(ctx context.Context, arg database
30273027
return q.db.InsertWorkspaceAgentMetadata(ctx, arg)
30283028
}
30293029

3030-
func (q *querier) InsertWorkspaceAgentScriptTimings(ctx context.Context, arg database.InsertWorkspaceAgentScriptTimingsParams) (database.WorkspaceAgentScriptTiming, error) {
3030+
func (q *querier) InsertWorkspaceAgentScriptTimings(ctx context.Context, arg database.InsertWorkspaceAgentScriptTimingsParams) error {
30313031
if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
3032-
return database.WorkspaceAgentScriptTiming{}, err
3032+
return err
30333033
}
30343034
return q.db.InsertWorkspaceAgentScriptTimings(ctx, arg)
30353035
}

‎coderd/database/dbmem/dbmem.go

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7827,29 +7827,28 @@ func (q *FakeQuerier) InsertWorkspaceAgentMetadata(_ context.Context, arg databa
78277827
return nil
78287828
}
78297829

7830-
func (q *FakeQuerier) InsertWorkspaceAgentScriptTimings(_ context.Context, arg database.InsertWorkspaceAgentScriptTimingsParams) (database.WorkspaceAgentScriptTiming, error) {
7830+
func (q *FakeQuerier) InsertWorkspaceAgentScriptTimings(_ context.Context, arg database.InsertWorkspaceAgentScriptTimingsParams) error {
78317831
err := validateDatabaseType(arg)
78327832
if err != nil {
7833-
return database.WorkspaceAgentScriptTiming{}, err
7833+
return err
78347834
}
78357835

78367836
q.mutex.Lock()
78377837
defer q.mutex.Unlock()
78387838

7839-
//nolint:gosimple // Stop linter suggesting 'arg' should be of type database.WorkspaceAgentScriptTiming
7840-
scriptTiming := database.WorkspaceAgentScriptTiming{
7841-
ScriptID: arg.ScriptID,
7842-
StartedAt: arg.StartedAt,
7843-
EndedAt: arg.EndedAt,
7844-
ExitCode: arg.ExitCode,
7845-
DisplayName: arg.DisplayName,
7846-
Stage: arg.Stage,
7847-
TimedOut: arg.TimedOut,
7848-
}
7849-
7850-
q.workspaceAgentScriptTimings = append(q.workspaceAgentScriptTimings, scriptTiming)
7839+
q.workspaceAgentScriptTimings = append(q.workspaceAgentScriptTimings,
7840+
database.WorkspaceAgentScriptTiming{
7841+
ScriptID: arg.ScriptID,
7842+
StartedAt: arg.StartedAt,
7843+
EndedAt: arg.EndedAt,
7844+
ExitCode: arg.ExitCode,
7845+
DisplayName: arg.DisplayName,
7846+
Stage: arg.Stage,
7847+
TimedOut: arg.TimedOut,
7848+
},
7849+
)
78517850

7852-
return scriptTiming, nil
7851+
return nil
78537852
}
78547853

78557854
func (q *FakeQuerier) InsertWorkspaceAgentScripts(_ context.Context, arg database.InsertWorkspaceAgentScriptsParams) ([]database.WorkspaceAgentScript, error) {

‎coderd/database/dbmetrics/dbmetrics.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbmock/dbmock.go

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/querier.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 5 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/workspaceagents.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ WHERE
288288
)
289289
;
290290

291-
-- name: InsertWorkspaceAgentScriptTimings :one
291+
-- name: InsertWorkspaceAgentScriptTimings :exec
292292
INSERT INTO
293293
workspace_agent_script_timings (
294294
script_id,
@@ -300,4 +300,4 @@ INSERT INTO
300300
timed_out
301301
)
302302
VALUES
303-
($1, $2, $3, $4, $5, $6, $7) RETURNING *;
303+
($1, $2, $3, $4, $5, $6, $7);

0 commit comments

Comments
 (0)