Skip to content

chore: rename "InsertOrUpdate" to Upsert around the codebase #6823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 28, 2023
Merged

chore: rename "InsertOrUpdate" to Upsert around the codebase #6823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f46d14
chore: rename "InsertOrUpdate" to Upsert around the codebase
ammario Mar 27, 2023
260ebe1
make gen
ammario Mar 28, 2023
fd40feb
Merge remote-tracking branch 'origin/main' into upsert
ammario Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions coderd/database/dbauthz/querier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,18 +340,18 @@ func (q *querier) InsertLicense(ctx context.Context, arg database.InsertLicenseP
return q.db.InsertLicense(ctx, arg)
}

func (q *querier) InsertOrUpdateLogoURL(ctx context.Context, value string) error {
func (q *querier) UpsertLogoURL(ctx context.Context, value string) error {
if err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceDeploymentValues); err != nil {
return err
}
return q.db.InsertOrUpdateLogoURL(ctx, value)
return q.db.UpsertLogoURL(ctx, value)
}

func (q *querier) InsertOrUpdateServiceBanner(ctx context.Context, value string) error {
func (q *querier) UpsertServiceBanner(ctx context.Context, value string) error {
if err := q.authorizeContext(ctx, rbac.ActionCreate, rbac.ResourceDeploymentValues); err != nil {
return err
}
return q.db.InsertOrUpdateServiceBanner(ctx, value)
return q.db.UpsertServiceBanner(ctx, value)
}

func (q *querier) GetLicenseByID(ctx context.Context, id int32) (database.License, error) {
Expand Down
8 changes: 4 additions & 4 deletions coderd/database/dbauthz/querier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,10 +312,10 @@ func (s *MethodTestSuite) TestLicense() {
check.Args(database.InsertLicenseParams{}).
Asserts(rbac.ResourceLicense, rbac.ActionCreate)
}))
s.Run("InsertOrUpdateLogoURL", s.Subtest(func(db database.Store, check *expects) {
s.Run("UpsertLogoURL", s.Subtest(func(db database.Store, check *expects) {
check.Args("value").Asserts(rbac.ResourceDeploymentValues, rbac.ActionCreate)
}))
s.Run("InsertOrUpdateServiceBanner", s.Subtest(func(db database.Store, check *expects) {
s.Run("UpsertServiceBanner", s.Subtest(func(db database.Store, check *expects) {
check.Args("value").Asserts(rbac.ResourceDeploymentValues, rbac.ActionCreate)
}))
s.Run("GetLicenseByID", s.Subtest(func(db database.Store, check *expects) {
Expand All @@ -336,12 +336,12 @@ func (s *MethodTestSuite) TestLicense() {
check.Args().Asserts().Returns("")
}))
s.Run("GetLogoURL", s.Subtest(func(db database.Store, check *expects) {
err := db.InsertOrUpdateLogoURL(context.Background(), "value")
err := db.UpsertLogoURL(context.Background(), "value")
require.NoError(s.T(), err)
check.Args().Asserts().Returns("value")
}))
s.Run("GetServiceBanner", s.Subtest(func(db database.Store, check *expects) {
err := db.InsertOrUpdateServiceBanner(context.Background(), "value")
err := db.UpsertServiceBanner(context.Background(), "value")
require.NoError(s.T(), err)
check.Args().Asserts().Returns("value")
}))
Expand Down
4 changes: 2 additions & 2 deletions coderd/database/dbauthz/system.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,11 @@ func (q *querier) UpdateWorkspaceBuildCostByID(ctx context.Context, arg database
return q.db.UpdateWorkspaceBuildCostByID(ctx, arg)
}

func (q *querier) InsertOrUpdateLastUpdateCheck(ctx context.Context, value string) error {
func (q *querier) UpsertLastUpdateCheck(ctx context.Context, value string) error {
if err := q.authorizeContext(ctx, rbac.ActionUpdate, rbac.ResourceSystem); err != nil {
return err
}
return q.db.InsertOrUpdateLastUpdateCheck(ctx, value)
return q.db.UpsertLastUpdateCheck(ctx, value)
}

func (q *querier) GetLastUpdateCheck(ctx context.Context) (string, error) {
Expand Down
4 changes: 2 additions & 2 deletions coderd/database/dbauthz/system_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ func (s *MethodTestSuite) TestSystemFunctions() {
DailyCost: 10,
}).Asserts(rbac.ResourceSystem, rbac.ActionUpdate).Returns(o)
}))
s.Run("InsertOrUpdateLastUpdateCheck", s.Subtest(func(db database.Store, check *expects) {
s.Run("UpsertLastUpdateCheck", s.Subtest(func(db database.Store, check *expects) {
check.Args("value").Asserts(rbac.ResourceSystem, rbac.ActionUpdate)
}))
s.Run("GetLastUpdateCheck", s.Subtest(func(db database.Store, check *expects) {
err := db.InsertOrUpdateLastUpdateCheck(context.Background(), "value")
err := db.UpsertLastUpdateCheck(context.Background(), "value")
require.NoError(s.T(), err)
check.Args().Asserts(rbac.ResourceSystem, rbac.ActionRead)
}))
Expand Down
6 changes: 3 additions & 3 deletions coderd/database/dbfake/databasefake.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4287,7 +4287,7 @@ func (q *fakeQuerier) GetDERPMeshKey(_ context.Context) (string, error) {
return q.derpMeshKey, nil
}

func (q *fakeQuerier) InsertOrUpdateLastUpdateCheck(_ context.Context, data string) error {
func (q *fakeQuerier) UpsertLastUpdateCheck(_ context.Context, data string) error {
q.mutex.RLock()
defer q.mutex.RUnlock()

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

func (q *fakeQuerier) InsertOrUpdateServiceBanner(_ context.Context, data string) error {
func (q *fakeQuerier) UpsertServiceBanner(_ context.Context, data string) error {
q.mutex.RLock()
defer q.mutex.RUnlock()

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

func (q *fakeQuerier) InsertOrUpdateLogoURL(_ context.Context, data string) error {
func (q *fakeQuerier) UpsertLogoURL(_ context.Context, data string) error {
q.mutex.RLock()
defer q.mutex.RUnlock()

Expand Down
6 changes: 3 additions & 3 deletions coderd/database/querier.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions coderd/database/queries.sql.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions coderd/database/queries/siteconfig.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,21 @@ INSERT INTO site_configs (key, value) VALUES ('derp_mesh_key', $1);
-- name: GetDERPMeshKey :one
SELECT value FROM site_configs WHERE key = 'derp_mesh_key';

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

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

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

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

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

Expand Down
2 changes: 1 addition & 1 deletion coderd/updatecheck/updatecheck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ func (c *Checker) update() (r Result, err error) {
}

// nolint:gocritic // Inserting the last update check is a system function.
err = c.db.InsertOrUpdateLastUpdateCheck(dbauthz.AsSystemRestricted(ctx), string(b))
err = c.db.UpsertLastUpdateCheck(dbauthz.AsSystemRestricted(ctx), string(b))
if err != nil {
return r, err
}
Expand Down
4 changes: 2 additions & 2 deletions enterprise/coderd/appearance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,15 @@ func (api *API) putAppearance(rw http.ResponseWriter, r *http.Request) {
return
}

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

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