Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita55186c

Browse files
authored
fix(database): remove usage ofString() for comparing UUIDs (#4547)
1 parent9c0cc65 commita55186c

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

‎coderd/database/databasefake/databasefake.go

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ func (q *fakeQuerier) ParameterValue(_ context.Context, id uuid.UUID) (database.
240240
deferq.mutex.Unlock()
241241

242242
for_,parameterValue:=rangeq.parameterValues {
243-
ifparameterValue.ID.String()!=id.String() {
243+
ifparameterValue.ID!=id {
244244
continue
245245
}
246246
returnparameterValue,nil
@@ -253,7 +253,7 @@ func (q *fakeQuerier) DeleteParameterValueByID(_ context.Context, id uuid.UUID)
253253
deferq.mutex.Unlock()
254254

255255
forindex,parameterValue:=rangeq.parameterValues {
256-
ifparameterValue.ID.String()!=id.String() {
256+
ifparameterValue.ID!=id {
257257
continue
258258
}
259259
q.parameterValues[index]=q.parameterValues[len(q.parameterValues)-1]
@@ -495,7 +495,7 @@ func (q *fakeQuerier) GetUsersByIDs(_ context.Context, ids []uuid.UUID) ([]datab
495495
users:=make([]database.User,0)
496496
for_,user:=rangeq.users {
497497
for_,id:=rangeids {
498-
ifuser.ID.String()!=id.String() {
498+
ifuser.ID!=id {
499499
continue
500500
}
501501
users=append(users,user)
@@ -716,7 +716,7 @@ func (q *fakeQuerier) GetWorkspaceByID(_ context.Context, id uuid.UUID) (databas
716716
deferq.mutex.RUnlock()
717717

718718
for_,workspace:=rangeq.workspaces {
719-
ifworkspace.ID.String()==id.String() {
719+
ifworkspace.ID==id {
720720
returnworkspace,nil
721721
}
722722
}
@@ -787,7 +787,7 @@ func (q *fakeQuerier) GetWorkspaceAppsByAgentIDs(_ context.Context, ids []uuid.U
787787
apps:=make([]database.WorkspaceApp,0)
788788
for_,app:=rangeq.workspaceApps {
789789
for_,id:=rangeids {
790-
ifapp.AgentID.String()==id.String() {
790+
ifapp.AgentID==id {
791791
apps=append(apps,app)
792792
break
793793
}
@@ -836,7 +836,7 @@ func (q *fakeQuerier) GetWorkspaceBuildByID(_ context.Context, id uuid.UUID) (da
836836
deferq.mutex.RUnlock()
837837

838838
for_,history:=rangeq.workspaceBuilds {
839-
ifhistory.ID.String()==id.String() {
839+
ifhistory.ID==id {
840840
returnhistory,nil
841841
}
842842
}
@@ -848,7 +848,7 @@ func (q *fakeQuerier) GetWorkspaceCountByUserID(_ context.Context, id uuid.UUID)
848848
deferq.mutex.RUnlock()
849849
varcountint64
850850
for_,workspace:=rangeq.workspaces {
851-
ifworkspace.OwnerID.String()==id.String() {
851+
ifworkspace.OwnerID==id {
852852
ifworkspace.Deleted {
853853
continue
854854
}
@@ -864,7 +864,7 @@ func (q *fakeQuerier) GetWorkspaceBuildByJobID(_ context.Context, jobID uuid.UUI
864864
deferq.mutex.RUnlock()
865865

866866
for_,build:=rangeq.workspaceBuilds {
867-
ifbuild.JobID.String()==jobID.String() {
867+
ifbuild.JobID==jobID {
868868
returnbuild,nil
869869
}
870870
}
@@ -953,7 +953,7 @@ func (q *fakeQuerier) GetWorkspaceBuildsByWorkspaceID(_ context.Context,
953953
ifworkspaceBuild.CreatedAt.Before(params.Since) {
954954
continue
955955
}
956-
ifworkspaceBuild.WorkspaceID.String()==params.WorkspaceID.String() {
956+
ifworkspaceBuild.WorkspaceID==params.WorkspaceID {
957957
history=append(history,workspaceBuild)
958958
}
959959
}
@@ -1006,7 +1006,7 @@ func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDAndBuildNumber(_ context.Con
10061006
deferq.mutex.RUnlock()
10071007

10081008
for_,workspaceBuild:=rangeq.workspaceBuilds {
1009-
ifworkspaceBuild.WorkspaceID.String()!=arg.WorkspaceID.String() {
1009+
ifworkspaceBuild.WorkspaceID!=arg.WorkspaceID {
10101010
continue
10111011
}
10121012
ifworkspaceBuild.BuildNumber!=arg.BuildNumber {
@@ -1121,7 +1121,7 @@ func (q *fakeQuerier) GetTemplateByID(_ context.Context, id uuid.UUID) (database
11211121
deferq.mutex.RUnlock()
11221122

11231123
for_,template:=rangeq.templates {
1124-
iftemplate.ID.String()==id.String() {
1124+
iftemplate.ID==id {
11251125
returntemplate,nil
11261126
}
11271127
}
@@ -1217,7 +1217,7 @@ func (q *fakeQuerier) GetTemplateVersionsByTemplateID(_ context.Context, arg dat
12171217
deferq.mutex.RUnlock()
12181218

12191219
for_,templateVersion:=rangeq.templateVersions {
1220-
iftemplateVersion.TemplateID.UUID.String()!=arg.TemplateID.String() {
1220+
iftemplateVersion.TemplateID.UUID!=arg.TemplateID {
12211221
continue
12221222
}
12231223
version=append(version,templateVersion)
@@ -1305,7 +1305,7 @@ func (q *fakeQuerier) GetTemplateVersionByID(_ context.Context, templateVersionI
13051305
deferq.mutex.RUnlock()
13061306

13071307
for_,templateVersion:=rangeq.templateVersions {
1308-
iftemplateVersion.ID.String()!=templateVersionID.String() {
1308+
iftemplateVersion.ID!=templateVersionID {
13091309
continue
13101310
}
13111311
returntemplateVersion,nil
@@ -1318,7 +1318,7 @@ func (q *fakeQuerier) GetTemplateVersionByJobID(_ context.Context, jobID uuid.UU
13181318
deferq.mutex.RUnlock()
13191319

13201320
for_,templateVersion:=rangeq.templateVersions {
1321-
iftemplateVersion.JobID.String()!=jobID.String() {
1321+
iftemplateVersion.JobID!=jobID {
13221322
continue
13231323
}
13241324
returntemplateVersion,nil
@@ -1332,7 +1332,7 @@ func (q *fakeQuerier) GetParameterSchemasByJobID(_ context.Context, jobID uuid.U
13321332

13331333
parameters:=make([]database.ParameterSchema,0)
13341334
for_,parameterSchema:=rangeq.parameterSchemas {
1335-
ifparameterSchema.JobID.String()!=jobID.String() {
1335+
ifparameterSchema.JobID!=jobID {
13361336
continue
13371337
}
13381338
parameters=append(parameters,parameterSchema)
@@ -1685,7 +1685,7 @@ func (q *fakeQuerier) GetProvisionerDaemonByID(_ context.Context, id uuid.UUID)
16851685
deferq.mutex.RUnlock()
16861686

16871687
for_,provisionerDaemon:=rangeq.provisionerDaemons {
1688-
ifprovisionerDaemon.ID.String()!=id.String() {
1688+
ifprovisionerDaemon.ID!=id {
16891689
continue
16901690
}
16911691
returnprovisionerDaemon,nil
@@ -1711,7 +1711,7 @@ func (q *fakeQuerier) GetWorkspaceResourceByID(_ context.Context, id uuid.UUID)
17111711
deferq.mutex.RUnlock()
17121712

17131713
for_,resource:=rangeq.provisionerJobResources {
1714-
ifresource.ID.String()==id.String() {
1714+
ifresource.ID==id {
17151715
returnresource,nil
17161716
}
17171717
}
@@ -1724,7 +1724,7 @@ func (q *fakeQuerier) GetWorkspaceResourcesByJobID(_ context.Context, jobID uuid
17241724

17251725
resources:=make([]database.WorkspaceResource,0)
17261726
for_,resource:=rangeq.provisionerJobResources {
1727-
ifresource.JobID.String()!=jobID.String() {
1727+
ifresource.JobID!=jobID {
17281728
continue
17291729
}
17301730
resources=append(resources,resource)
@@ -1791,7 +1791,7 @@ func (q *fakeQuerier) GetWorkspaceResourceMetadataByResourceID(_ context.Context
17911791

17921792
metadata:=make([]database.WorkspaceResourceMetadatum,0)
17931793
for_,metadatum:=rangeq.provisionerJobResourceMetadata {
1794-
ifmetadatum.WorkspaceResourceID.String()==id.String() {
1794+
ifmetadatum.WorkspaceResourceID==id {
17951795
metadata=append(metadata,metadatum)
17961796
}
17971797
}
@@ -1805,7 +1805,7 @@ func (q *fakeQuerier) GetWorkspaceResourceMetadataByResourceIDs(_ context.Contex
18051805
metadata:=make([]database.WorkspaceResourceMetadatum,0)
18061806
for_,metadatum:=rangeq.provisionerJobResourceMetadata {
18071807
for_,id:=rangeids {
1808-
ifmetadatum.WorkspaceResourceID.String()==id.String() {
1808+
ifmetadatum.WorkspaceResourceID==id {
18091809
metadata=append(metadata,metadatum)
18101810
}
18111811
}
@@ -1820,7 +1820,7 @@ func (q *fakeQuerier) GetProvisionerJobsByIDs(_ context.Context, ids []uuid.UUID
18201820
jobs:=make([]database.ProvisionerJob,0)
18211821
for_,job:=rangeq.provisionerJobs {
18221822
for_,id:=rangeids {
1823-
ifid.String()==job.ID.String() {
1823+
ifid==job.ID {
18241824
jobs=append(jobs,job)
18251825
break
18261826
}
@@ -1852,7 +1852,7 @@ func (q *fakeQuerier) GetProvisionerLogsByIDBetween(_ context.Context, arg datab
18521852

18531853
logs:=make([]database.ProvisionerJobLog,0)
18541854
for_,jobLog:=rangeq.provisionerJobLogs {
1855-
ifjobLog.JobID.String()!=arg.JobID.String() {
1855+
ifjobLog.JobID!=arg.JobID {
18561856
continue
18571857
}
18581858
if!arg.CreatedBefore.IsZero()&&jobLog.CreatedAt.After(arg.CreatedBefore) {
@@ -2663,7 +2663,7 @@ func (q *fakeQuerier) UpdateGitSSHKey(_ context.Context, arg database.UpdateGitS
26632663
deferq.mutex.Unlock()
26642664

26652665
forindex,key:=rangeq.gitSSHKey {
2666-
ifkey.UserID.String()!=arg.UserID.String() {
2666+
ifkey.UserID!=arg.UserID {
26672667
continue
26682668
}
26692669
key.UpdatedAt=arg.UpdatedAt
@@ -2726,7 +2726,7 @@ func (q *fakeQuerier) DeleteGitSSHKey(_ context.Context, userID uuid.UUID) error
27262726
deferq.mutex.Unlock()
27272727

27282728
forindex,key:=rangeq.gitSSHKey {
2729-
ifkey.UserID.String()!=userID.String() {
2729+
ifkey.UserID!=userID {
27302730
continue
27312731
}
27322732
q.gitSSHKey[index]=q.gitSSHKey[len(q.gitSSHKey)-1]
@@ -3039,7 +3039,7 @@ func (q *fakeQuerier) InsertGroup(_ context.Context, arg database.InsertGroupPar
30393039
deferq.mutex.RUnlock()
30403040

30413041
for_,group:=rangeq.groups {
3042-
ifgroup.OrganizationID.String()==arg.OrganizationID.String()&&
3042+
ifgroup.OrganizationID==arg.OrganizationID&&
30433043
group.Name==arg.Name {
30443044
return database.Group{},errDuplicateKey
30453045
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp