8000 refactor: rename SQL queries · coder/coder@2eeb884 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2eeb884

Browse files
evgeniy-scherbinaevgeniy-scherbina
committed
refactor: rename SQL queries
1 parent 3a97bf6 commit 2eeb884

File tree

8 files changed

+36
-36
lines changed

8 files changed

+36
-36
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1137,13 +1137,13 @@ func (q *querier) BulkMarkNotificationMessagesSent(ctx context.Context, arg data
11371137
return q.db.BulkMarkNotificationMessagesSent(ctx, arg)
11381138
}
11391139

1140-
func (q *querier) ClaimPrebuild(ctx context.Context, newOwnerID database.ClaimPrebuildParams) (database.ClaimPrebuildRow, error) {
1140+
func (q *querier) ClaimPrebuiltWorkspace(ctx context.Context, newOwnerID database.ClaimPrebuiltWorkspaceParams) (database.ClaimPrebuiltWorkspaceRow, error) {
11411141
if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceWorkspace); err != nil {
1142-
return database.ClaimPrebuildRow{
1142+
return database.ClaimPrebuiltWorkspaceRow{
11431143
ID: uuid.Nil,
11441144
}, err
11451145
}
1146-
return q.db.ClaimPrebuild(ctx, newOwnerID)
1146+
return q.db.ClaimPrebuiltWorkspace(ctx, newOwnerID)
11471147
}
11481148

11491149
func (q *querier) CleanTailnetCoordinators(ctx context.Context) error {

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,7 +1748,7 @@ func (s *MethodTestSuite) TestUser() {
17481748
check.Args(database.DeleteCustomRoleParams{
17491749
Name: customRole.Name,
17501750
}).Asserts(
1751-
// fails immediately, missing organization id
1751+
// fails immediately, missing organization id
17521752
).Errors(dbauthz.NotAuthorizedError{Err: xerrors.New("custom roles must belong to an organization")})
17531753
}))
17541754
s.Run("Blank/UpdateCustomRole", s.Subtest(func(db database.Store, check *expects) {
@ 10000 @ -1779,7 +1779,7 @@ func (s *MethodTestSuite) TestUser() {
17791779
codersdk.ResourceWorkspace: {codersdk.ActionRead},
17801780
}), convertSDKPerm),
17811781
}).Asserts(
1782-
// fails immediately, missing organization id
1782+
// fails immediately, missing organization id
17831783
).Errors(dbauthz.NotAuthorizedError{Err: xerrors.New("custom roles must belong to an organization")})
17841784
}))
17851785
s.Run("OrgPermissions/UpdateCustomRole", s.Subtest(func(db database.Store, check *expects) {
@@ -1832,7 +1832,7 @@ func (s *MethodTestSuite) TestUser() {
18321832
codersdk.ResourceWorkspace: {codersdk.ActionRead},
18331833
}), convertSDKPerm),
18341834
}).Asserts(
1835-
// fails immediately, missing organization id
1835+
// fails immediately, missing organization id
18361836
).Errors(dbauthz.NotAuthorizedError{Err: xerrors.New("custom roles must belong to an organization")})
18371837
}))
18381838
s.Run("OrgPermissions/InsertCustomRole", s.Subtest(func(db database.Store, check *expects) {
@@ -3843,7 +3843,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
38433843
s.Run("GetProvisionerJobsCreatedAfter", s.Subtest(func(db database.Store, check *expects) {
38443844
// TODO: add provisioner job resource type
38453845
_ = dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{CreatedAt: time.Now().Add(-time.Hour)})
3846-
check.Args(time.Now()).Asserts( /*rbac.ResourceSystem, policy.ActionRead*/)
3846+
check.Args(time.Now()).Asserts( /*rbac.ResourceSystem, policy.ActionRead*/ )
38473847
}))
38483848
s.Run("GetTemplateVersionsByIDs", s.Subtest(func(db database.Store, check *expects) {
38493849
dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)
@@ -4020,7 +4020,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
40204020
a := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40214021
b := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40224022
check.Args([]uuid.UUID{a.ID, b.ID}).
4023-
Asserts( /*rbac.ResourceSystem, policy.ActionRead*/).
4023+
Asserts( /*rbac.ResourceSystem, policy.ActionRead*/ ).
40244024
Returns(slice.New(a, b))
40254025
}))
40264026
s.Run("InsertWorkspaceAgent", s.Subtest(func(db database.Store, check *expects) {
@@ -4065,22 +4065,22 @@ func (s *MethodTestSuite) TestSystemFunctions() {
40654065
OrganizationID: j.OrganizationID,
40664066
Types: []database.ProvisionerType{j.Provisioner},
40674067
ProvisionerTags: must(json.Marshal(j.Tags)),
4068-
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/)
4068+
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/ )
40694069
}))
40704070
s.Run("UpdateProvisionerJobWithCompleteByID", s.Subtest(func(db database.Store, check *expects) {
40714071
// TODO: we need to create a ProvisionerJob resource
40724072
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40734073
check.Args(database.UpdateProvisionerJobWithCompleteByIDParams{
40744074
ID: j.ID,
4075-
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/)
4075+
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/ )
40764076
}))
40774077
s.Run("UpdateProvisionerJobByID", s.Subtest(func(db database.Store, check *expects) {
40784078
// TODO: we need to create a ProvisionerJob resource
40794079
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40804080
check.Args(database.UpdateProvisionerJobByIDParams{
40814081
ID: j.ID,
40824082
UpdatedAt: time.Now(),
4083-
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/)
4083+
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/ )
40844084
}))
40854085
s.Run("InsertProvisionerJob", s.Subtest(func(db database.Store, check *expects) {
40864086
dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)
@@ -4091,21 +4091,21 @@ func (s *MethodTestSuite) TestSystemFunctions() {
40914091
StorageMethod: database.ProvisionerStorageMethodFile,
40924092
Type: database.ProvisionerJobTypeWorkspaceBuild,
40934093
Input: json.RawMessage("{}"),
4094-
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/)
4094+
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/ )
40954095
}))
40964096
s.Run("InsertProvisionerJobLogs", s.Subtest(func(db database.Store, check *expects) {
40974097
// TODO: we need to create a ProvisionerJob resource
40984098
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40994099
check.Args(database.InsertProvisionerJobLogsParams{
41004100
JobID: j.ID,
4101-
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/)
4101+
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/ )
41024102
}))
41034103
s.Run("InsertProvisionerJobTimings", s.Subtest(func(db database.Store, check *expects) {
41044104
// TODO: we need to create a ProvisionerJob resource
41054105
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
41064106
check.Args(database.InsertProvisionerJobTimingsParams{
41074107
JobID: j.ID,
4108-
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/)
4108+
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/ )
41094109
}))
41104110
s.Run("UpsertProvisionerDaemon", s.Subtest(func(db database.Store, check *expects) {
41114111
dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)
@@ -4800,8 +4800,8 @@ func (s *MethodTestSuite) TestNotifications() {
48004800
}
48014801

48024802
func (s *MethodTestSuite) TestPrebuilds() {
4803-
s.Run("ClaimPrebuild", s.Subtest(func(db database.Store, check *expects) {
4804-
check.Args(database.ClaimPrebuildParams{}).
4803+
s.Run("ClaimPrebuiltWorkspace", s.Subtest(func(db database.Store, check *expects) {
4804+
check.Args(database.ClaimPrebuiltWorkspaceParams{}).
48054805
Asserts(rbac.ResourceWorkspace, policy.ActionUpdate).
48064806
ErrorsWithInMemDB(dbmem.ErrUnimplemented).
48074807
ErrorsWithPG(sql.ErrNoRows)

‎coderd/database/dbmem/dbmem.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1740,8 +1740,8 @@ func (*FakeQuerier) BulkMarkNotificationMessagesSent(_ context.Context, arg data
17401740
return int64(len(arg.IDs)), nil
17411741
}
17421742

1743-
func (*FakeQuerier) ClaimPrebuild(_ context.Context, _ database.ClaimPrebuildParams) (database.ClaimPrebuildRow, error) {
1744-
return database.ClaimPrebuildRow{}, ErrUnimplemented
1743+
func (q *FakeQuerier) ClaimPrebuiltWorkspace(ctx context.Context, arg database.ClaimPrebuiltWorkspaceParams) (database.ClaimPrebuiltWorkspaceRow, error) {
1744+
return database.ClaimPrebuiltWorkspaceRow{}, ErrUnimplemented
17451745
}
17461746

17471747
func (*FakeQuerier) CleanTailnetCoordinators(_ context.Context) error {

‎coderd/database/dbmetrics/querymetrics.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: 7 additions & 7 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: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/prebuilds.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ WHERE tsb.rn <= tsb.desired_instances -- Fetch the last N builds, where N is the
100100
AND created_at >= @lookback::timestamptz
101101
GROUP BY tsb.template_version_id, tsb.preset_id, fc.num_failed;
102102

103-
-- name: ClaimPrebuild :one
103+
-- name: ClaimPrebuiltWorkspace :one
104104
UPDATE workspaces w
105105
SET owner_id = @new_user_id::uuid,
106106
name = @new_name::text,

0 commit comments

Comments
 (0)
0