Skip to content

Commit 5b97bcd

Browse files
aslilacaslilac
committed
oh boy
1 parent f86d7fe commit 5b97bcd

File tree

14 files changed

+145
-117
lines changed

14 files changed

+145
-117
lines changed

‎coderd/database/dbmem/dbmem.go

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -54,32 +54,33 @@ func New() database.Store {
5454
q := &FakeQuerier{
5555
mutex: &sync.RWMutex{},
5656
data: &data{
57-
apiKeys: make([]database.APIKey, 0),
58-
auditLogs: make([]database.AuditLog, 0),
59-
customRoles: make([]database.CustomRole, 0),
60-
dbcryptKeys: make([]database.DBCryptKey, 0),
61-
externalAuthLinks: make([]database.ExternalAuthLink, 0),
62-
files: make([]database.File, 0),
63-
gitSSHKey: make([]database.GitSSHKey, 0),
64-
groups: make([]database.Group, 0),
65-
groupMembers: make([]database.GroupMemberTable, 0),
66-
licenses: make([]database.License, 0),
67-
locks: map[int64]struct{}{},
68-
notificationMessages: make([]database.NotificationMessage, 0),
69-
notificationPreferences: make([]database.NotificationPreference, 0),
70-
organizationMembers: make([]database.OrganizationMember, 0),
71-
organizations: make([]database.Organization, 0),
72-
inboxNotifications: make([]database.InboxNotification, 0),
73-
parameterSchemas: make([]database.ParameterSchema, 0),
74-
presets: make([]database.TemplateVersionPreset, 0),
75-
presetParameters: make([]database.TemplateVersionPresetParameter, 0),
76-
provisionerDaemons: make([]database.ProvisionerDaemon, 0),
77-
provisionerJobs: make([]database.ProvisionerJob, 0),
78-
provisionerJobLogs: make([]database.ProvisionerJobLog, 0),
79-
provisionerKeys: make([]database.ProvisionerKey, 0),
80-
runtimeConfig: map[string]string{},
81-
telemetryItems: make([]database.TelemetryItem, 0),
82-
templateVersions: make([]database.TemplateVersionTable, 0),
57+
apiKeys: make([]database.APIKey, 0),
58+
auditLogs: make([]database.AuditLog, 0),
59+
customRoles: make([]database.CustomRole, 0),
60+
dbcryptKeys: make([]database.DBCryptKey, 0),
61+
externalAuthLinks: make([]database.ExternalAuthLink, 0),
62+
files: make([]database.File, 0),
63+
gitSSHKey: make([]database.GitSSHKey, 0),
64+
groups: make([]database.Group, 0),
65+
groupMembers: make([]database.GroupMemberTable, 0),
66+
licenses: make([]database.License, 0),
67+
locks: map[int64]struct{}{},
68+
notificationMessages: make([]database.NotificationMessage, 0),
69+
notificationPreferences: make([]database.NotificationPreference, 0),
70+
organizationMembers: make([]database.OrganizationMember, 0),
71+
organizations: make([]database.Organization, 0),
72+
inboxNotifications: make([]database.InboxNotification, 0),
73+
parameterSchemas: make([]database.ParameterSchema, 0),
74+
presets: make([]database.TemplateVersionPreset, 0),
75+
presetParameters: make([]database.TemplateVersionPresetParameter, 0),
76+
provisionerDaemons: make([]database.ProvisionerDaemon, 0),
77+
provisionerJobs: make([]database.ProvisionerJob, 0),
78+
provisionerJobLogs: make([]database.ProvisionerJobLog, 0),
79+
provisionerKeys: make([]database.ProvisionerKey, 0),
80+
runtimeConfig: map[string]string{},
81+
telemetryItems: make([]database.TelemetryItem, 0),
82+
templateVersions: make([]database.TemplateVersionTable, 0),
83+
// templateVersionTerraformData: make([]database.TemplateVersionTerraformDatum, 0),
8384
templates: make([]database.TemplateTable, 0),
8485
users: make([]database.User, 0),
8586
userConfigs: make([]database.UserConfig, 0),

‎coderd/database/dbmock/dbmock.go

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

‎coderd/database/dump.sql

Lines changed: 13 additions & 3 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: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/migrations/000302_template_import_graph.down.sql

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1 @@
1-
-- Do the dance of dropping a view...
2-
drop view template_version_with_user;
3-
4-
5-
-- ...removing the column we added to the table...
6-
alter table template_versions drop column cached_plan;
7-
8-
9-
-- ...and finally recreating the view.
10-
create view
11-
template_version_with_user
12-
as
13-
select
14-
template_versions.*,
15-
coalesce(visible_users.avatar_url, '') as created_by_avatar_url,
16-
coalesce(visible_users.username, '') as created_by_username
17-
from
18-
template_versions
19-
left join
20-
visible_users
21-
on
22-
template_versions.created_by = visible_users.id;
23-
24-
comment on view template_version_with_user is 'Joins in the username + avatar url of the created by user.';
1+
drop table template_version_terraform_values;

‎coderd/database/migrations/000302_template_import_graph.up.sql

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,5 @@
1-
-- Do the dance of dropping a view...
2-
drop view template_version_with_user;
3-
4-
5-
-- ...adding the column we want to the table...
6-
alter table template_versions add column cached_plan jsonb not null default '{}';
7-
8-
9-
-- ...and finally recreating the view.
10-
create view
11-
template_version_with_user
12-
as
13-
select
14-
template_versions.*,
15-
coalesce(visible_users.avatar_url, '') as created_by_avatar_url,
16-
coalesce(visible_users.username, '') as created_by_username
17-
from
18-
template_versions
19-
left join
20-
visible_users
21-
on
22-
template_versions.created_by = visible_users.id;
23-
24-
comment on view template_version_with_user is 'Joins in the username + avatar url of the created by user.';
1+
create table template_version_terraform_values (
2+
template_version_id uuid not null unique references template_versions(id),
3+
updated_at timestamptz not null default now(),
4+
cached_plan jsonb not null
5+
);

‎coderd/database/models.go

Lines changed: 9 additions & 5 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 & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)