Skip to content

Commit d040ddd

Browse files
evgeniy-scherbinaevgeniy-scherbina
committed
refactor: remove unnecessary JOIN
1 parent ee1f16a commit d040ddd

File tree

3 files changed

+36
-37
lines changed

3 files changed

+36
-37
lines changed

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1692,7 +1692,7 @@ func (s *MethodTestSuite) TestUser() {
16921692
check.Args(database.DeleteCustomRoleParams{
16931693
Name: customRole.Name,
16941694
}).Asserts(
1695-
// fails immediately, missing organization id
1695+
// fails immediately, missing organization id
16961696
).Errors(dbauthz.NotAuthorizedError{Err: xerrors.New("custom roles must belong to an organization")})
16971697
}))
16981698
s.Run("Blank/UpdateCustomRole", s.Subtest(func(db database.Store, check *expects) {
@@ -1723,7 +1723,7 @@ func (s *MethodTestSuite) TestUser() {
17231723
codersdk.ResourceWorkspace: {codersdk.ActionRead},
17241724
}), convertSDKPerm),
17251725
}).Asserts(
1726-
// fails immediately, missing organization id
1726+
// fails immediately, missing organization id
17271727
).Errors(dbauthz.NotAuthorizedError{Err: xerrors.New("custom roles must belong to an organization")})
17281728
}))
17291729
s.Run("OrgPermissions/UpdateCustomRole", s.Subtest(func(db database.Store, check *expects) {
@@ -1776,7 +1776,7 @@ func (s *MethodTestSuite) TestUser() {
17761776
codersdk.ResourceWorkspace: {codersdk.ActionRead},
17771777
}), convertSDKPerm),
17781778
}).Asserts(
1779-
// fails immediately, missing organization id
1779+
// fails immediately, missing organization id
17801780
).Errors(dbauthz.NotAuthorizedError{Err: xerrors.New("custom roles must belong to an organization")})
17811781
}))
17821782
s.Run("OrgPermissions/InsertCustomRole", s.Subtest(func(db database.Store, check *expects) {
@@ -3757,7 +3757,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
37573757
s.Run("GetProvisionerJobsCreatedAfter", s.Subtest(func(db database.Store, check *expects) {
37583758
// TODO: add provisioner job resource type
37593759
_ = dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{CreatedAt: time.Now().Add(-time.Hour)})
3760-
check.Args(time.Now()).Asserts( /*rbac.ResourceSystem, policy.ActionRead*/ )
3760+
check.Args(time.Now()).Asserts( /*rbac.ResourceSystem, policy.ActionRead*/)
37613761
}))
37623762
s.Run("GetTemplateVersionsByIDs", s.Subtest(func(db database.Store, check *expects) {
37633763
dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)
@@ -3934,7 +3934,7 @@ func (s *MethodTestSuite) TestSystemFunctions() {
39343934
a := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
39353935
b := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
39363936
check.Args([]uuid.UUID{a.ID, b.ID}).
3937-
Asserts( /*rbac.ResourceSystem, policy.ActionRead*/ ).
3937+
Asserts( /*rbac.ResourceSystem, policy.ActionRead*/).
39383938
Returns(slice.New(a, b))
39393939
}))
39403940
s.Run("InsertWorkspaceAgent", s.Subtest(func(db database.Store, check *expects) {
@@ -3979,22 +3979,22 @@ func (s *MethodTestSuite) TestSystemFunctions() {
39793979
OrganizationID: j.OrganizationID,
39803980
Types: []database.ProvisionerType{j.Provisioner},
39813981
ProvisionerTags: must(json.Marshal(j.Tags)),
3982-
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/ )
3982+
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/)
39833983
}))
39843984
s.Run("UpdateProvisionerJobWithCompleteByID", s.Subtest(func(db database.Store, check *expects) {
39853985
// TODO: we need to create a ProvisionerJob resource
39863986
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
39873987
check.Args(database.UpdateProvisionerJobWithCompleteByIDParams{
39883988
ID: j.ID,
3989-
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/ )
3989+
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/)
39903990
}))
39913991
s.Run("UpdateProvisionerJobByID", s.Subtest(func(db database.Store, check *expects) {
39923992
// TODO: we need to create a ProvisionerJob resource
39933993
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
39943994
check.Args(database.UpdateProvisionerJobByIDParams{
39953995
ID: j.ID,
39963996
UpdatedAt: time.Now(),
3997-
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/ )
3997+
}).Asserts( /*rbac.ResourceSystem, policy.ActionUpdate*/)
39983998
}))
39993999
s.Run("InsertProvisionerJob", s.Subtest(func(db database.Store, check *expects) {
40004000
dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)
@@ -4005,21 +4005,21 @@ func (s *MethodTestSuite) TestSystemFunctions() {
40054005
StorageMethod: database.ProvisionerStorageMethodFile,
40064006
Type: database.ProvisionerJobTypeWorkspaceBuild,
40074007
Input: json.RawMessage("{}"),
4008-
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/ )
4008+
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/)
40094009
}))
40104010
s.Run("InsertProvisionerJobLogs", s.Subtest(func(db database.Store, check *expects) {
40114011
// TODO: we need to create a ProvisionerJob resource
40124012
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40134013
check.Args(database.InsertProvisionerJobLogsParams{
40144014
JobID: j.ID,
4015-
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/ )
4015+
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/)
40164016
}))
40174017
s.Run("InsertProvisionerJobTimings", s.Subtest(func(db database.Store, check *expects) {
40184018
// TODO: we need to create a ProvisionerJob resource
40194019
j := dbgen.ProvisionerJob(s.T(), db, nil, database.ProvisionerJob{})
40204020
check.Args(database.InsertProvisionerJobTimingsParams{
40214021
JobID: j.ID,
4022-
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/ )
4022+
}).Asserts( /*rbac.ResourceSystem, policy.ActionCreate*/)
40234023
}))
40244024
s.Run("UpsertProvisionerDaemon", s.Subtest(func(db database.Store, check *expects) {
40254025
dbtestutil.DisableForeignKeysAndTriggers(s.T(), db)
@@ -4675,30 +4675,31 @@ func (s *MethodTestSuite) TestPrebuilds() {
46754675
Asserts(rbac.ResourceTemplate, policy.ActionRead).
46764676
ErrorsWithInMemDB(dbmem.ErrUnimplemented)
46774677
}))
4678-
s.Run("InsertPresetPrebuild", s.Subtest(func(db database.Store, check *expects) {
4679-
org := dbgen.Organization(s.T(), db, database.Organization{})
4680-
user := dbgen.User(s.T(), db, database.User{})
4681-
template := dbgen.Template(s.T(), db, database.Template{
4682-
CreatedBy: user.ID,
4683-
OrganizationID: org.ID,
4684-
})
4685-
templateVersion := dbgen.TemplateVersion(s.T(), db, database.TemplateVersion{
4686-
TemplateID: uuid.NullUUID{UUID: template.ID, Valid: true},
4687-
OrganizationID: org.ID,
4688-
CreatedBy: user.ID,
4689-
})
4690-
preset := dbgen.Preset(s.T(), db, database.InsertPresetParams{
4691-
Name: coderdtest.RandomName(s.T()),
4692-
TemplateVersionID: templateVersion.ID,
4693-
})
4694-
check.Args(database.InsertPresetPrebuildParams{
4695-
ID: uuid.New(),
4696-
PresetID: preset.ID,
4697-
DesiredInstances: 1,
4698-
}).
4699-
Asserts(rbac.ResourceSystem, policy.ActionCreate).
4700-
ErrorsWithInMemDB(dbmem.ErrUnimplemented)
4701-
}))
4678+
// TODO: remove?
4679+
//s.Run("InsertPresetPrebuild", s.Subtest(func(db database.Store, check *expects) {
4680+
// org := dbgen.Organization(s.T(), db, database.Organization{})
4681+
// user := dbgen.User(s.T(), db, database.User{})
4682+
// template := dbgen.Template(s.T(), db, database.Template{
4683+
// CreatedBy: user.ID,
4684+
// OrganizationID: org.ID,
4685+
// })
4686+
// templateVersion := dbgen.TemplateVersion(s.T(), db, database.TemplateVersion{
4687+
// TemplateID: uuid.NullUUID{UUID: template.ID, Valid: true},
4688+
// OrganizationID: org.ID,
4689+
// CreatedBy: user.ID,
4690+
// })
4691+
// preset := dbgen.Preset(s.T(), db, database.InsertPresetParams{
4692+
// Name: coderdtest.RandomName(s.T()),
4693+
// TemplateVersionID: templateVersion.ID,
4694+
// })
4695+
// check.Args(database.InsertPresetPrebuildParams{
4696+
// ID: uuid.New(),
4697+
// PresetID: preset.ID,
4698+
// DesiredInstances: 1,
4699+
// }).
4700+
// Asserts(rbac.ResourceSystem, policy.ActionCreate).
4701+
// ErrorsWithInMemDB(dbmem.ErrUnimplemented)
4702+
//}))
47024703
}
47034704

47044705
func (s *MethodTestSuite) TestOAuth2ProviderApps() {

‎coderd/database/queries.sql.go

Lines changed: 0 additions & 1 deletion
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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ SELECT p.id AS workspace_id,
3131
FROM workspace_prebuilds p
3232
INNER JOIN workspace_latest_builds b ON b.workspace_id = p.id
3333
INNER JOIN provisioner_jobs pj ON b.job_id = pj.id
34-
INNER JOIN templates t ON p.template_id = t.id
3534
LEFT JOIN template_version_presets tvp_curr
3635
ON tvp_curr.id = p.current_preset_id -- See https://github.com/coder/internal/issues/398.
3736
WHERE (b.transition = 'start'::workspace_transition

0 commit comments

Comments
 (0)