Skip to content

Commit 36119ca

Browse files
johnstcnjohnstcn
committed
fix(coderd): remove workspace_builds.sidebar_app_id
1 parent 4613bdd commit 36119ca

16 files changed

+139
-110
lines changed

‎coderd/database/check_constraint.go

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

‎coderd/database/dbauthz/dbauthz_test.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3252,13 +3252,9 @@ func (s *MethodTestSuite) TestWorkspace() {
32523252
WorkspaceID: w.ID,
32533253
TemplateVersionID: tv.ID,
32543254
})
3255-
res := dbgen.WorkspaceResource(s.T(), db, database.WorkspaceResource{JobID: b.JobID})
3256-
agt := dbgen.WorkspaceAgent(s.T(), db, database.WorkspaceAgent{ResourceID: res.ID})
3257-
app := dbgen.WorkspaceApp(s.T(), db, database.WorkspaceApp{AgentID: agt.ID})
32583255
check.Args(database.UpdateWorkspaceBuildAITaskByIDParams{
3259-
HasAITask: sql.NullBool{Bool: true, Valid: true},
3260-
SidebarAppID: uuid.NullUUID{UUID: app.ID, Valid: true},
3261-
ID: b.ID,
3256+
HasAITask: sql.NullBool{Bool: true, Valid: true},
3257+
ID: b.ID,
32623258
}).Asserts(w, policy.ActionUpdate)
32633259
}))
32643260
s.Run("SoftDeleteWorkspaceByID", s.Subtest(func(db database.Store, check *expects) {

‎coderd/database/dbgen/dbgen.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,6 @@ func WorkspaceBuild(t testing.TB, db database.Store, orig database.WorkspaceBuil
436436
buildID := takeFirst(orig.ID, uuid.New())
437437
jobID := takeFirst(orig.JobID, uuid.New())
438438
hasAITask := takeFirst(orig.HasAITask, sql.NullBool{})
439-
sidebarAppID := takeFirst(orig.AITaskSidebarAppID, uuid.NullUUID{})
440439
var build database.WorkspaceBuild
441440
err := db.InTx(func(db database.Store) error {
442441
err := db.InsertWorkspaceBuild(genCtx, database.InsertWorkspaceBuildParams{
@@ -472,10 +471,9 @@ func WorkspaceBuild(t testing.TB, db database.Store, orig database.WorkspaceBuil
472471

473472
if hasAITask.Valid {
474473
require.NoError(t, db.UpdateWorkspaceBuildAITaskByID(genCtx, database.UpdateWorkspaceBuildAITaskByIDParams{
475-
HasAITask: hasAITask,
476-
SidebarAppID: sidebarAppID,
477-
UpdatedAt: dbtime.Now(),
478-
ID: buildID,
474+
HasAITask: hasAITask,
475+
UpdatedAt: dbtime.Now(),
476+
ID: buildID,
479477
}))
480478
}
481479

‎coderd/database/dump.sql

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

‎coderd/database/foreign_key_constraint.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/migrations/000357_remove_sidebar_app_id.down.sql

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
DROP VIEW workspace_build_with_user;
2+
3+
ALTER TABLE ONLY workspace_builds ADD COLUMN ai_task_sidebar_app_id UUID DEFAULT NULL;
4+
5+
ALTER TABLE workspace_builds ADD CONSTRAINT workspace_builds_ai_task_sidebar_app_id_fkey FOREIGN KEY (ai_task_sidebar_app_id) REFERENCES workspace_apps(id);
6+
7+
ALTER TABLE workspace_builds
8+
ADD CONSTRAINT workspace_builds_ai_task_sidebar_app_id_required CHECK (
9+
((has_ai_task IS NULL OR has_ai_task = false) AND ai_task_sidebar_app_id IS NULL)
10+
OR (has_ai_task = true AND ai_task_sidebar_app_id IS NOT NULL)
11+
);
12+
13+
14+
CREATE VIEW workspace_build_with_user AS
15+
SELECT
16+
workspace_builds.id,
17+
workspace_builds.created_at,
18+
workspace_builds.updated_at,
19+
workspace_builds.workspace_id,
20+
workspace_builds.template_version_id,
21+
workspace_builds.build_number,
22+
workspace_builds.transition,
23+
workspace_builds.initiator_id,
24+
workspace_builds.provisioner_state,
25+
workspace_builds.job_id,
26+
workspace_builds.deadline,
27+
workspace_builds.reason,
28+
workspace_builds.daily_cost,
29+
workspace_builds.max_deadline,
30+
workspace_builds.template_version_preset_id,
31+
workspace_builds.has_ai_task,
32+
workspace_builds.ai_task_sidebar_app_id,
33+
COALESCE(
34+
visible_users.avatar_url,
35+
'' :: text
36+
) AS initiator_by_avatar_url,
37+
COALESCE(
38+
visible_users.username,
39+
'' :: text
40+
) AS initiator_by_username,
41+
COALESCE(visible_users.name, '' :: text) AS initiator_by_name
42+
FROM
43+
(
44+
workspace_builds
45+
LEFT JOIN visible_users ON (
46+
(
47+
workspace_builds.initiator_id = visible_users.id
48+
)
49+
)
50+
);
51+
52+
COMMENT ON VIEW workspace_build_with_user IS 'Joins in the username + avatar url of the initiated by user.';

‎coderd/database/migrations/000357_remove_sidebar_app_id.up.sql

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
DROP VIEW workspace_build_with_user;
2+
3+
ALTER TABLE ONLY workspace_builds DROP CONSTRAINT workspace_builds_ai_task_sidebar_app_id_required;
4+
ALTER TABLE ONLY workspace_builds DROP COLUMN ai_task_sidebar_app_id;
5+
6+
CREATE VIEW workspace_build_with_user AS
7+
SELECT
8+
workspace_builds.id,
9+
workspace_builds.created_at,
10+
workspace_builds.updated_at,
11+
workspace_builds.workspace_id,
12+
workspace_builds.template_version_id,
13+
workspace_builds.build_number,
14+
workspace_builds.transition,
15+
workspace_builds.initiator_id,
16+
workspace_builds.provisioner_state,
17+
workspace_builds.job_id,
18+
workspace_builds.deadline,
19+
workspace_builds.reason,
20+
workspace_builds.daily_cost,
21+
workspace_builds.max_deadline,
22+
workspace_builds.template_version_preset_id,
23+
workspace_builds.has_ai_task,
24+
COALESCE(
25+
visible_users.avatar_url,
26+
'' :: text
27+
) AS initiator_by_avatar_url,
28+
COALESCE(
29+
visible_users.username,
30+
'' :: text
31+
) AS initiator_by_username,
32+
COALESCE(visible_users.name, '' :: text) AS initiator_by_name
33+
FROM
34+
(
35+
workspace_builds
36+
LEFT JOIN visible_users ON (
37+
(
38+
workspace_builds.initiator_id = visible_users.id
39+
)
40+
)
41+
);
42+
43+
COMMENT ON VIEW workspace_build_with_user IS 'Joins in the username + avatar url of the initiated by user.';

‎coderd/database/models.go

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

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy