Skip to content

Commit 42b3d90

Browse files
ammarioammario
authored
chore: rename "InsertOrUpdate" to Upsert around the codebase (#6823)
* chore: rename "InsertOrUpdate" to Upsert around the codebase The shorter name uses up less line width, is easier to read and is used more often. * make gen
1 parent f88f273 commit 42b3d90

File tree

10 files changed

+33
-33
lines changed

10 files changed

+33
-33
lines changed

‎coderd/database/dbauthz/querier.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,18 +340,18 @@ func (q *querier) InsertLicense(ctx context.Context, arg database.InsertLicenseP
340340
return q.db.InsertLicense(ctx, arg)
341341
}
342342

343-
func (q *querier) InsertOrUpdateLogoURL(ctx context.Context, value string) error {
343+
func (q *querier) UpsertLogoURL(ctx context.Context, value string) error {
344344
if err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceDeploymentValues); err != nil {
345345
return err
346346
}
347-
return q.db.InsertOrUpdateLogoURL(ctx, value)
347+
return q.db.UpsertLogoURL(ctx, value)
348348
}
349349

350-
func (q *querier) InsertOrUpdateServiceBanner(ctx context.Context, value string) error {
350+
func (q *querier) UpsertServiceBanner(ctx context.Context, value string) error {
351351
if err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceDeploymentValues); err != nil {
352352
return err
353353
}
354-
return q.db.InsertOrUpdateServiceBanner(ctx, value)
354+
return q.db.UpsertServiceBanner(ctx, value)
355355
}
356356

357357
func (q *querier) GetLicenseByID(ctx context.Context, id int32) (database.License, error) {

‎coderd/database/dbauthz/querier_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,10 @@ func (s *MethodTestSuite) TestLicense() {
312312
check.Args(database.InsertLicenseParams{}).
313313
Asserts(rbac.ResourceLicense, rbac.ActionCreate)
314314
}))
315-
s.Run("InsertOrUpdateLogoURL", s.Subtest(func(db database.Store, check *expects) {
315+
s.Run("UpsertLogoURL", s.Subtest(func(db database.Store, check *expects) {
316316
check.Args("value").Asserts(rbac.ResourceDeploymentValues, rbac.ActionCreate)
317317
}))
318-
s.Run("InsertOrUpdateServiceBanner", s.Subtest(func(db database.Store, check *expects) {
318+
s.Run("UpsertServiceBanner", s.Subtest(func(db database.Store, check *expects) {
319319
check.Args("value").Asserts(rbac.ResourceDeploymentValues, rbac.ActionCreate)
320320
}))
321321
s.Run("GetLicenseByID", s.Subtest(func(db database.Store, check *expects) {
@@ -336,12 +336,12 @@ func (s *MethodTestSuite) TestLicense() {
336336
check.Args().Asserts().Returns("")
337337
}))
338338
s.Run("GetLogoURL", s.Subtest(func(db database.Store, check *expects) {
339-
err := db.InsertOrUpdateLogoURL(context.Background(), "value")
339+
err := db.UpsertLogoURL(context.Background(), "value")
340340
require.NoError(s.T(), err)
341341
check.Args().Asserts().Returns("value")
342342
}))
343343
s.Run("GetServiceBanner", s.Subtest(func(db database.Store, check *expects) {
344-
err := db.InsertOrUpdateServiceBanner(context.Background(), "value")
344+
err := db.UpsertServiceBanner(context.Background(), "value")
345345
require.NoError(s.T(), err)
346346
check.Args().Asserts().Returns("value")
347347
}))

‎coderd/database/dbauthz/system.go

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

231-
func (q *querier) InsertOrUpdateLastUpdateCheck(ctx context.Context, value string) error {
231+
func (q *querier) UpsertLastUpdateCheck(ctx context.Context, value string) error {
232232
if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceSystem); err != nil {
233233
return err
234234
}
235-
return q.db.InsertOrUpdateLastUpdateCheck(ctx, value)
235+
return q.db.UpsertLastUpdateCheck(ctx, value)
236236
}
237237

238238
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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4287,7 +4287,7 @@ func (q *fakeQuerier) GetDERPMeshKey(_ context.Context) (string, error) {
42874287
return q.derpMeshKey, nil
42884288
}
42894289

4290-
func (q *fakeQuerier) InsertOrUpdateLastUpdateCheck(_ context.Context, data string) error {
4290+
func (q *fakeQuerier) UpsertLastUpdateCheck(_ context.Context, data string) error {
42914291
q.mutex.RLock()
42924292
defer q.mutex.RUnlock()
42934293

@@ -4305,7 +4305,7 @@ func (q *fakeQuerier) GetLastUpdateCheck(_ context.Context) (string, error) {
43054305
return string(q.lastUpdateCheck), nil
43064306
}
43074307

4308-
func (q *fakeQuerier) InsertOrUpdateServiceBanner(_ context.Context, data string) error {
4308+
func (q *fakeQuerier) UpsertServiceBanner(_ context.Context, data string) error {
43094309
q.mutex.RLock()
43104310
defer q.mutex.RUnlock()
43114311

@@ -4324,7 +4324,7 @@ func (q *fakeQuerier) GetServiceBanner(_ context.Context) (string, error) {
43244324
return string(q.serviceBanner), nil
43254325
}
43264326

4327-
func (q *fakeQuerier) InsertOrUpdateLogoURL(_ context.Context, data string) error {
4327+
func (q *fakeQuerier) UpsertLogoURL(_ context.Context, data string) error {
43284328
q.mutex.RLock()
43294329
defer q.mutex.RUnlock()
43304330

‎coderd/database/querier.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/queries.sql.go

Lines changed: 9 additions & 9 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/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
}

‎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)