Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8beccfa

Browse files
EmyrkEmyrk
committed
Rename type
1 parent 541f985 commit 8beccfa

13 files changed

+68
-67
lines changed

‎coderd/autobuild/executor/lifecycle_executor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ func (e *Executor) runOnce(t time.Time) Stats {
190190

191191
// TODO(cian): this function duplicates most of api.postWorkspaceBuilds. Refactor.
192192
// See: https://github.com/coder/coder/issues/1401
193-
func build(ctx context.Context, store database.Store, workspace database.Workspace, trans database.WorkspaceTransition, priorHistory database.WorkspaceBuildsWithInitiator, priorJob database.ProvisionerJob) error {
193+
func build(ctx context.Context, store database.Store, workspace database.Workspace, trans database.WorkspaceTransition, priorHistory database.WorkspaceBuildWithInitiator, priorJob database.ProvisionerJob) error {
194194
template, err := store.GetTemplateByID(ctx, workspace.TemplateID)
195195
if err != nil {
196196
return xerrors.Errorf("get workspace template: %w", err)

‎coderd/database/databasefake/databasefake.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ func (q *fakeQuerier) GetWorkspaceOwnerCountsByTemplateIDs(_ context.Context, te
476476
return res, nil
477477
}
478478

479-
func (q *fakeQuerier) GetWorkspaceBuildByID(_ context.Context, id uuid.UUID) (database.WorkspaceBuildsWithInitiator, error) {
479+
func (q *fakeQuerier) GetWorkspaceBuildByID(_ context.Context, id uuid.UUID) (database.WorkspaceBuildWithInitiator, error) {
480480
q.mutex.RLock()
481481
defer q.mutex.RUnlock()
482482

@@ -485,10 +485,10 @@ func (q *fakeQuerier) GetWorkspaceBuildByID(_ context.Context, id uuid.UUID) (da
485485
return q.workspaceBuildWithInitiator(history), nil
486486
}
487487
}
488-
return database.WorkspaceBuildsWithInitiator{}, sql.ErrNoRows
488+
return database.WorkspaceBuildWithInitiator{}, sql.ErrNoRows
489489
}
490490

491-
func (q *fakeQuerier) GetWorkspaceBuildByJobID(_ context.Context, jobID uuid.UUID) (database.WorkspaceBuildsWithInitiator, error) {
491+
func (q *fakeQuerier) GetWorkspaceBuildByJobID(_ context.Context, jobID uuid.UUID) (database.WorkspaceBuildWithInitiator, error) {
492492
q.mutex.RLock()
493493
defer q.mutex.RUnlock()
494494

@@ -497,14 +497,14 @@ func (q *fakeQuerier) GetWorkspaceBuildByJobID(_ context.Context, jobID uuid.UUI
497497
return q.workspaceBuildWithInitiator(build), nil
498498
}
499499
}
500-
return database.WorkspaceBuildsWithInitiator{}, sql.ErrNoRows
500+
return database.WorkspaceBuildWithInitiator{}, sql.ErrNoRows
501501
}
502502

503-
func (q *fakeQuerier) GetLatestWorkspaceBuildByWorkspaceID(_ context.Context, workspaceID uuid.UUID) (database.WorkspaceBuildsWithInitiator, error) {
503+
func (q *fakeQuerier) GetLatestWorkspaceBuildByWorkspaceID(_ context.Context, workspaceID uuid.UUID) (database.WorkspaceBuildWithInitiator, error) {
504504
q.mutex.RLock()
505505
defer q.mutex.RUnlock()
506506

507-
var row database.WorkspaceBuildsWithInitiator
507+
var row database.WorkspaceBuildWithInitiator
508508
var buildNum int32
509509
for _, workspaceBuild := range q.workspaceBuilds {
510510
if workspaceBuild.WorkspaceID.String() == workspaceID.String() && workspaceBuild.BuildNumber > buildNum {
@@ -513,16 +513,16 @@ func (q *fakeQuerier) GetLatestWorkspaceBuildByWorkspaceID(_ context.Context, wo
513513
}
514514
}
515515
if buildNum == 0 {
516-
return database.WorkspaceBuildsWithInitiator{}, sql.ErrNoRows
516+
return database.WorkspaceBuildWithInitiator{}, sql.ErrNoRows
517517
}
518518
return row, nil
519519
}
520520

521-
func (q *fakeQuerier) GetLatestWorkspaceBuildsByWorkspaceIDs(_ context.Context, ids []uuid.UUID) ([]database.WorkspaceBuildsWithInitiator, error) {
521+
func (q *fakeQuerier) GetLatestWorkspaceBuildsByWorkspaceIDs(_ context.Context, ids []uuid.UUID) ([]database.WorkspaceBuildWithInitiator, error) {
522522
q.mutex.RLock()
523523
defer q.mutex.RUnlock()
524524

525-
builds := make(map[uuid.UUID]database.WorkspaceBuildsWithInitiator)
525+
builds := make(map[uuid.UUID]database.WorkspaceBuildWithInitiator)
526526
buildNumbers := make(map[uuid.UUID]int32)
527527
for _, workspaceBuild := range q.workspaceBuilds {
528528
for _, id := range ids {
@@ -532,7 +532,7 @@ func (q *fakeQuerier) GetLatestWorkspaceBuildsByWorkspaceIDs(_ context.Context,
532532
}
533533
}
534534
}
535-
var returnBuilds []database.WorkspaceBuildsWithInitiator
535+
var returnBuilds []database.WorkspaceBuildWithInitiator
536536
for i, n := range buildNumbers {
537537
if n > 0 {
538538
b := builds[i]
@@ -546,19 +546,19 @@ func (q *fakeQuerier) GetLatestWorkspaceBuildsByWorkspaceIDs(_ context.Context,
546546
}
547547

548548
func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceID(_ context.Context,
549-
params database.GetWorkspaceBuildByWorkspaceIDParams) ([]database.WorkspaceBuildsWithInitiator, error) {
549+
params database.GetWorkspaceBuildByWorkspaceIDParams) ([]database.WorkspaceBuildWithInitiator, error) {
550550
q.mutex.RLock()
551551
defer q.mutex.RUnlock()
552552

553-
history := make([]database.WorkspaceBuildsWithInitiator, 0)
553+
history := make([]database.WorkspaceBuildWithInitiator, 0)
554554
for _, workspaceBuild := range q.workspaceBuilds {
555555
if workspaceBuild.WorkspaceID.String() == params.WorkspaceID.String() {
556556
history = append(history, q.workspaceBuildWithInitiator(workspaceBuild))
557557
}
558558
}
559559

560560
// Order by build_number
561-
slices.SortFunc(history, func(a, b database.WorkspaceBuildsWithInitiator) bool {
561+
slices.SortFunc(history, func(a, b database.WorkspaceBuildWithInitiator) bool {
562562
// use greater than since we want descending order
563563
return a.BuildNumber > b.BuildNumber
564564
})
@@ -600,7 +600,7 @@ func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceID(_ context.Context,
600600
return history, nil
601601
}
602602

603-
func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDAndName(_ context.Context, arg database.GetWorkspaceBuildByWorkspaceIDAndNameParams) (database.WorkspaceBuildsWithInitiator, error) {
603+
func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDAndName(_ context.Context, arg database.GetWorkspaceBuildByWorkspaceIDAndNameParams) (database.WorkspaceBuildWithInitiator, error) {
604604
q.mutex.RLock()
605605
defer q.mutex.RUnlock()
606606

@@ -614,16 +614,16 @@ func (q *fakeQuerier) GetWorkspaceBuildByWorkspaceIDAndName(_ context.Context, a
614614

615615
return q.workspaceBuildWithInitiator(workspaceBuild), nil
616616
}
617-
return database.WorkspaceBuildsWithInitiator{}, sql.ErrNoRows
617+
return database.WorkspaceBuildWithInitiator{}, sql.ErrNoRows
618618
}
619619

620-
func (q *fakeQuerier) workspaceBuildWithInitiator(build database.WorkspaceBuild) database.WorkspaceBuildsWithInitiator {
620+
func (q *fakeQuerier) workspaceBuildWithInitiator(build database.WorkspaceBuild) database.WorkspaceBuildWithInitiator {
621621
username := "unknown"
622622
usr, err := q.GetUserByID(context.Background(), build.InitiatorID)
623623
if err == nil {
624624
username = usr.Username
625625
}
626-
return database.WorkspaceBuildsWithInitiator{
626+
return database.WorkspaceBuildWithInitiator{
627627
ID: build.ID,
628628
CreatedAt: build.CreatedAt,
629629
UpdatedAt: build.UpdatedAt,

‎coderd/database/dump.sql

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/migrations/000022_workspace_builds_with_initiaitor_view.down.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
DROP VIEW IF EXISTS workspace_builds_with_initiator;
1+
DROP VIEW IF EXISTS workspace_build_with_initiator;

‎coderd/database/migrations/000022_workspace_builds_with_initiaitor_view.up.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
-- This view adds the initiator name to the query for UI purposes.
22
-- Showing the initiator user ID is not very friendly.
3-
CREATE VIEW workspace_builds_with_initiator AS
3+
CREATE VIEW workspace_build_with_initiator AS
44
-- If the user is nil, just use 'unknown' for now.
55
SELECT workspace_builds.*, coalesce(users.username, 'unknown') AS initiator_username
66
FROM workspace_builds

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

Lines changed: 22 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/workspacebuilds.sql

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
SELECT
33
*
44
FROM
5-
workspace_builds_with_initiator
5+
workspace_build_with_initiator
66
WHERE
77
id = $1
88
LIMIT
@@ -12,7 +12,7 @@ LIMIT
1212
SELECT
1313
*
1414
FROM
15-
workspace_builds_with_initiator
15+
workspace_build_with_initiator
1616
WHERE
1717
job_id = $1
1818
LIMIT
@@ -22,7 +22,7 @@ LIMIT
2222
SELECT
2323
*
2424
FROM
25-
workspace_builds_with_initiator
25+
workspace_build_with_initiator
2626
WHERE
2727
workspace_id = $1
2828
AND "name" = $2;
@@ -31,9 +31,9 @@ WHERE
3131
SELECT
3232
*
3333
FROM
34-
workspace_builds_with_initiator
34+
workspace_build_with_initiator
3535
WHERE
36-
workspace_builds_with_initiator.workspace_id = $1
36+
workspace_build_with_initiator.workspace_id = $1
3737
AND CASE
3838
-- This allows using the last element on a page as effectively a cursor.
3939
-- This is an important option for scripts that need to paginate without
@@ -63,7 +63,7 @@ LIMIT
6363
SELECT
6464
*
6565
FROM
66-
workspace_builds_with_initiator
66+
workspace_build_with_initiator
6767
WHERE
6868
workspace_id = $1
6969
ORDER BY
@@ -77,14 +77,14 @@ FROM (
7777
SELECT
7878
workspace_id, MAX(build_number) as max_build_number
7979
FROM
80-
workspace_builds_with_initiator
80+
workspace_build_with_initiator
8181
WHERE
8282
workspace_id = ANY(@ids :: uuid [ ])
8383
GROUP BY
8484
workspace_id
8585
) m
8686
JOIN
87-
workspace_builds_with_initiator wb
87+
workspace_build_with_initiator wb
8888
ON m.workspace_id = wb.workspace_id AND m.max_build_number = wb.build_number;
8989

9090

0 commit comments

Comments
 (0)