template queries

f0ssel · f0ssel · commit e75535526659 · 2024-02-08T16:39:24.000Z
diff --git a/coderd/database/migrations/000187_workspace_agent_port_sharing.down.sql b/coderd/database/migrations/000187_workspace_agent_port_sharing.down.sql
@@ -1 +1,4 @@
 DROP TABLE workspace_agent_port_sharing;
+
+ALTER TABLE templates DROP COLUMN max_port_sharing;
+
diff --git a/coderd/database/migrations/000187_workspace_agent_port_sharing.up.sql b/coderd/database/migrations/000187_workspace_agent_port_sharing.up.sql
@@ -4,3 +4,22 @@ CREATE TABLE workspace_agent_port_sharing (
 	port integer NOT NULL,
 	share_level integer NOT NULL
 );
+
+ALTER TABLE templates ADD COLUMN max_port_sharing integer NOT NULL DEFAULT 0;
+
+-- Update the template_with_users view by recreating it.
+DROP VIEW template_with_users;
+CREATE VIEW
+    template_with_users
+AS
+    SELECT
+        templates.*,
+		coalesce(visible_users.avatar_url, '') AS created_by_avatar_url,
+		coalesce(visible_users.username, '') AS created_by_username
+    FROM
+        templates
+    LEFT JOIN
+		visible_users
+	ON
+	    templates.created_by = visible_users.id;
+COMMENT ON VIEW template_with_users IS 'Joins in the username + avatar url of the created by user.';
diff --git a/coderd/database/modelqueries.go b/coderd/database/modelqueries.go
@@ -90,6 +90,7 @@ func (q *sqlQuerier) GetAuthorizedTemplates(ctx context.Context, arg GetTemplate
 			&i.RequireActiveVersion,
 			&i.Deprecated,
 			&i.UseMaxTtl,
+			&i.MaxPortSharing,
 			&i.CreatedByAvatarURL,
 			&i.CreatedByUsername,
 		); err != nil {
diff --git a/coderd/database/queries/templates.sql b/coderd/database/queries/templates.sql
@@ -83,10 +83,11 @@ INSERT INTO
 		user_acl,
 		group_acl,
 		display_name,
-		allow_user_cancel_workspace_jobs
+		allow_user_cancel_workspace_jobs,
+		max_port_sharing
 	)
 VALUES
-	($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14);
+	($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15);
 
 -- name: UpdateTemplateActiveVersionByID :exec
 UPDATE
@@ -116,7 +117,8 @@ SET
 	icon = $5,
 	display_name = $6,
 	allow_user_cancel_workspace_jobs = $7,
-	group_acl = $8
+	group_acl = $8,
+	max_port_sharing = $9
 WHERE
 	id = $1
 ;
diff --git a/coderd/database/queries/workspaceagentportsharing.sql b/coderd/database/queries/workspaceagentportsharing.sql
@@ -1,13 +1,11 @@
 -- name: CreateWorkspaceAgentPortShareLevel :exec
-INSERT INTO workspace_port_sharing (workspace_id, agent_name, port, share_level) VALUES ($1, $2, $3, $4);
+INSERT INTO workspace_agent_port_sharing (workspace_id, agent_name, port, share_level) VALUES ($1, $2, $3, $4);
 
 -- name: GetWorkspaceAgentPortShareLevel :one
-SELECT * FROM workspace_port_sharing WHERE workspace_id = $1 AND agent_name = $2 AND port = $3;
+SELECT * FROM workspace_agent_port_sharing WHERE workspace_id = $1 AND agent_name = $2 AND port = $3;
 
 -- name: UpdateWorkspaceAgentPortShareLevel :exec
-UPDATE workspace_port_sharing SET share_level = $1 WHERE workspace_id = $2 AND agent_name = $3 AND port = $4;
+UPDATE workspace_agent_port_sharing SET share_level = $1 WHERE workspace_id = $2 AND agent_name = $3 AND port = $4;
 
 -- name: DeleteWorkspaceAgentPortShareLevel :exec
-DELETE FROM workspace_port_sharing WHERE workspace_id = $1 AND agent_name = $2 AND port = $3;
-
-
+DELETE FROM workspace_agent_port_sharing WHERE workspace_id = $1 AND agent_name = $2 AND port = $3;

-Original file line number
+Diff line change
@@ @@ -1 +1,4 @@ @@
 DROP TABLE workspace_agent_port_sharing;
++
 +ALTER TABLE templates DROP COLUMN max_port_sharing;
++