Skip to content

Commit 5ef5671

Browse files
ammarioammario
committed
Upsert
1 parent e4a5dd1 commit 5ef5671

File tree

12 files changed

+44
-44
lines changed

12 files changed

+44
-44
lines changed

‎coderd/database/dbauthz/querier.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -286,18 +286,18 @@ func (q *querier) InsertLicense(ctx context.Context, arg database.InsertLicenseP
286286
return q.db.InsertLicense(ctx, arg)
287287
}
288288

289-
func (q *querier) InsertOrUpdateLogoURL(ctx context.Context, value string) error {
289+
func (q *querier) UpsertLogoURL(ctx context.Context, value string) error {
290290
if err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceDeploymentValues); err != nil {
291291
return err
292292
}
293-
return q.db.InsertOrUpdateLogoURL(ctx, value)
293+
return q.db.UpsertLogoURL(ctx, value)
294294
}
295295

296-
func (q *querier) InsertOrUpdateServiceBanner(ctx context.Context, value string) error {
296+
func (q *querier) UpsertServiceBanner(ctx context.Context, value string) error {
297297
if err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceDeploymentValues); err != nil {
298298
return err
299299
}
300-
return q.db.InsertOrUpdateServiceBanner(ctx, value)
300+
return q.db.UpsertServiceBanner(ctx, value)
301301
}
302302

303303
func (q *querier) GetLicenseByID(ctx context.Context, id int32) (database.License, error) {
@@ -1472,7 +1472,7 @@ func (q *querier) InsertWorkspaceAgentStat(ctx context.Context, arg database.Ins
14721472
return q.db.InsertWorkspaceAgentStat(ctx, arg)
14731473
}
14741474

1475-
func (q *querier) InsertOrUpdateWorkspaceAgentMetadata(ctx context.Context, arg database.InsertOrUpdateWorkspaceAgentMetadataParams) error {
1475+
func (q *querier) UpsertWorkspaceAgentMetadata(ctx context.Context, arg database.UpsertWorkspaceAgentMetadataParams) error {
14761476
workspace, err := q.db.GetWorkspaceByID(ctx, arg.WorkspaceID)
14771477
if err != nil {
14781478
return err
@@ -1483,7 +1483,7 @@ func (q *querier) InsertOrUpdateWorkspaceAgentMetadata(ctx context.Context, arg
14831483
return err
14841484
}
14851485

1486-
return q.db.InsertOrUpdateWorkspaceAgentMetadata(ctx, arg)
1486+
return q.db.UpsertWorkspaceAgentMetadata(ctx, arg)
14871487
}
14881488

14891489
func (q *querier) GetWorkspaceAgentMetadata(ctx context.Context, workspaceAgentID uuid.UUID) ([]database.WorkspaceAgentMetadatum, error) {

‎coderd/database/dbauthz/querier_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,10 +307,10 @@ func (s *MethodTestSuite) TestLicense() {
307307
check.Args(database.InsertLicenseParams{}).
308308
Asserts(rbac.ResourceLicense, rbac.ActionCreate)
309309
}))
310-
s.Run("InsertOrUpdateLogoURL", s.Subtest(func(db database.Store, check *expects) {
310+
s.Run("UpsertLogoURL", s.Subtest(func(db database.Store, check *expects) {
311311
check.Args("value").Asserts(rbac.ResourceDeploymentValues, rbac.ActionCreate)
312312
}))
313-
s.Run("InsertOrUpdateServiceBanner", s.Subtest(func(db database.Store, check *expects) {
313+
s.Run("UpsertServiceBanner", s.Subtest(func(db database.Store, check *expects) {
314314
check.Args("value").Asserts(rbac.ResourceDeploymentValues, rbac.ActionCreate)
315315
}))
316316
s.Run("GetLicenseByID", s.Subtest(func(db database.Store, check *expects) {
@@ -331,12 +331,12 @@ func (s *MethodTestSuite) TestLicense() {
331331
check.Args().Asserts().Returns("")
332332
}))
333333
s.Run("GetLogoURL", s.Subtest(func(db database.Store, check *expects) {
334-
err := db.InsertOrUpdateLogoURL(context.Background(), "value")
334+
err := db.UpsertLogoURL(context.Background(), "value")
335335
require.NoError(s.T(), err)
336336
check.Args().Asserts().Returns("value")
337337
}))
338338
s.Run("GetServiceBanner", s.Subtest(func(db database.Store, check *expects) {
339-
err := db.InsertOrUpdateServiceBanner(context.Background(), "value")
339+
err := db.UpsertServiceBanner(context.Background(), "value")
340340
require.NoError(s.T(), err)
341341
check.Args().Asserts().Returns("value")
342342
}))

‎coderd/database/dbauthz/system.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,11 +221,11 @@ func (q *querier) UpdateWorkspaceBuildCostByID(ctx context.Context, arg database
221221
return q.db.UpdateWorkspaceBuildCostByID(ctx, arg)
222222
}
223223

224-
func (q *querier) InsertOrUpdateLastUpdateCheck(ctx context.Context, value string) error {
224+
func (q *querier) UpsertLastUpdateCheck(ctx context.Context, value string) error {
225225
if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceSystem); err != nil {
226226
return err
227227
}
228-
return q.db.InsertOrUpdateLastUpdateCheck(ctx, value)
228+
return q.db.UpsertLastUpdateCheck(ctx, value)
229229
}
230230

231231
func (q *querier) GetLastUpdateCheck(ctx context.Context) (string, error) {

‎coderd/database/dbauthz/system_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ func (s *MethodTestSuite) TestSystemFunctions() {
102102
DailyCost: 10,
103103
}).Asserts(rbac.ResourceSystem, rbac.ActionUpdate).Returns(o)
104104
}))
105-
s.Run("InsertOrUpdateLastUpdateCheck", s.Subtest(func(db database.Store, check *expects) {
105+
s.Run("UpsertLastUpdateCheck", s.Subtest(func(db database.Store, check *expects) {
106106
check.Args("value").Asserts(rbac.ResourceSystem, rbac.ActionUpdate)
107107
}))
108108
s.Run("GetLastUpdateCheck", s.Subtest(func(db database.Store, check *expects) {
109-
err := db.InsertOrUpdateLastUpdateCheck(context.Background(), "value")
109+
err := db.UpsertLastUpdateCheck(context.Background(), "value")
110110
require.NoError(s.T(), err)
111111
check.Args().Asserts(rbac.ResourceSystem, rbac.ActionRead)
112112
}))

‎coderd/database/dbfake/databasefake.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2670,7 +2670,7 @@ func (q *fakeQuerier) InsertAPIKey(_ context.Context, arg database.InsertAPIKeyP
26702670
return key, nil
26712671
}
26722672

2673-
func (q *fakeQuerier) InsertOrUpdateWorkspaceAgentMetadata(_ context.Context, arg database.InsertOrUpdateWorkspaceAgentMetadataParams) error {
2673+
func (q *fakeQuerier) UpsertWorkspaceAgentMetadata(_ context.Context, arg database.UpsertWorkspaceAgentMetadataParams) error {
26742674
q.mutex.Lock()
26752675
defer q.mutex.Unlock()
26762676

@@ -4223,7 +4223,7 @@ func (q *fakeQuerier) GetDERPMeshKey(_ context.Context) (string, error) {
42234223
return q.derpMeshKey, nil
42244224
}
42254225

4226-
func (q *fakeQuerier) InsertOrUpdateLastUpdateCheck(_ context.Context, data string) error {
4226+
func (q *fakeQuerier) UpsertLastUpdateCheck(_ context.Context, data string) error {
42274227
q.mutex.RLock()
42284228
defer q.mutex.RUnlock()
42294229

@@ -4241,7 +4241,7 @@ func (q *fakeQuerier) GetLastUpdateCheck(_ context.Context) (string, error) {
42414241
return string(q.lastUpdateCheck), nil
42424242
}
42434243

4244-
func (q *fakeQuerier) InsertOrUpdateServiceBanner(_ context.Context, data string) error {
4244+
func (q *fakeQuerier) UpsertServiceBanner(_ context.Context, data string) error {
42454245
q.mutex.RLock()
42464246
defer q.mutex.RUnlock()
42474247

@@ -4260,7 +4260,7 @@ func (q *fakeQuerier) GetServiceBanner(_ context.Context) (string, error) {
42604260
return string(q.serviceBanner), nil
42614261
}
42624262

4263-
func (q *fakeQuerier) InsertOrUpdateLogoURL(_ context.Context, data string) error {
4263+
func (q *fakeQuerier) UpsertLogoURL(_ context.Context, data string) error {
42644264
q.mutex.RLock()
42654265
defer q.mutex.RUnlock()
42664266

‎coderd/database/querier.go

Lines changed: 4 additions & 4 deletions
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: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/siteconfig.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,21 @@ INSERT INTO site_configs (key, value) VALUES ('derp_mesh_key', $1);
1010
-- name: GetDERPMeshKey :one
1111
SELECT value FROM site_configs WHERE key = 'derp_mesh_key';
1212

13-
-- name: InsertOrUpdateLastUpdateCheck :exec
13+
-- name: UpsertLastUpdateCheck :exec
1414
INSERT INTO site_configs (key, value) VALUES ('last_update_check', $1)
1515
ON CONFLICT (key) DO UPDATE SET value = $1 WHERE site_configs.key = 'last_update_check';
1616

1717
-- name: GetLastUpdateCheck :one
1818
SELECT value FROM site_configs WHERE key = 'last_update_check';
1919

20-
-- name: InsertOrUpdateServiceBanner :exec
20+
-- name: UpsertServiceBanner :exec
2121
INSERT INTO site_configs (key, value) VALUES ('service_banner', $1)
2222
ON CONFLICT (key) DO UPDATE SET value = $1 WHERE site_configs.key = 'service_banner';
2323

2424
-- name: GetServiceBanner :one
2525
SELECT value FROM site_configs WHERE key = 'service_banner';
2626

27-
-- name: InsertOrUpdateLogoURL :exec
27+
-- name: UpsertLogoURL :exec
2828
INSERT INTO site_configs (key, value) VALUES ('logo_url', $1)
2929
ON CONFLICT (key) DO UPDATE SET value = $1 WHERE site_configs.key = 'logo_url';
3030

‎coderd/database/queries/workspaceagents.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ SET
9494
WHERE
9595
id = $1;
9696

97-
-- name: InsertOrUpdateWorkspaceAgentMetadata :exec
97+
-- name: UpsertWorkspaceAgentMetadata :exec
9898
INSERT INTO
9999
workspace_agent_metadata (
100100
workspace_id,

‎coderd/updatecheck/updatecheck.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ func (c *Checker) update() (r Result, err error) {
211211
}
212212

213213
// nolint:gocritic // Inserting the last update check is a system function.
214-
err = c.db.InsertOrUpdateLastUpdateCheck(dbauthz.AsSystemRestricted(ctx), string(b))
214+
err = c.db.UpsertLastUpdateCheck(dbauthz.AsSystemRestricted(ctx), string(b))
215215
if err != nil {
216216
return r, err
217217
}

‎coderd/workspaceagents.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,7 +1064,7 @@ func (api *API) workspaceAgentPostMetadata(rw http.ResponseWriter, r *http.Reque
10641064
return
10651065
}
10661066

1067-
datum := database.InsertOrUpdateWorkspaceAgentMetadataParams{
1067+
datum := database.UpsertWorkspaceAgentMetadataParams{
10681068
WorkspaceID: workspace.ID,
10691069
WorkspaceAgentID: workspaceAgent.ID,
10701070
// We don't want a misconfigured agent to fill the database.
@@ -1074,7 +1074,7 @@ func (api *API) workspaceAgentPostMetadata(rw http.ResponseWriter, r *http.Reque
10741074
CollectedAt: req.CollectedAt,
10751075
}
10761076

1077-
err = api.Database.InsertOrUpdateWorkspaceAgentMetadata(ctx, datum)
1077+
err = api.Database.UpsertWorkspaceAgentMetadata(ctx, datum)
10781078
if err != nil {
10791079
httpapi.InternalServerError(rw, err)
10801080
return

‎enterprise/coderd/appearance.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,15 +148,15 @@ func (api *API) putAppearance(rw http.ResponseWriter, r *http.Request) {
148148
return
149149
}
150150

151-
err = api.Database.InsertOrUpdateServiceBanner(ctx, string(serviceBannerJSON))
151+
err = api.Database.UpsertServiceBanner(ctx, string(serviceBannerJSON))
152152
if err != nil {
153153
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
154154
Message: fmt.Sprintf("database error: %+v", err),
155155
})
156156
return
157157
}
158158

159-
err = api.Database.InsertOrUpdateLogoURL(ctx, appearance.LogoURL)
159+
err = api.Database.UpsertLogoURL(ctx, appearance.LogoURL)
160160
if err != nil {
161161
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
162162
Message: fmt.Sprintf("database error: %+v", err),

0 commit comments

Comments
 (0)