Update migration to promote either admin

Emyrk · Emyrk · commit 52cac69f1a3d · 2022-08-12T17:29:42.000-05:00
diff --git a/coderd/database/migrations/000034_remove_admin_role.down.sql b/coderd/database/migrations/000034_remove_admin_role.down.sql
@@ -3,13 +3,13 @@ UPDATE
 SET
 	-- Replace 'template-admin' and 'user-admin' role with 'admin'
 	rbac_roles = array_append(
-		array_remove(
-			array_remove(users.rbac_roles, 'template-admin'),
-			'user-admin'
-		), 'admin')
+			array_remove(
+					array_remove(rbac_roles, 'template-admin'),
+					'user-admin'
+				), 'admin')
 WHERE
-	-- Only on existing admins
-	ARRAY ['template-admin', 'user-admin'] <@ rbac_roles;
+	-- Only on existing admins. If they have either role, make them an admin
+	ARRAY ['template-admin', 'user-admin'] && rbac_roles;
 
 
 UPDATE
diff --git a/coderd/database/migrations/000034_remove_admin_role.up.sql b/coderd/database/migrations/000034_remove_admin_role.up.sql
@@ -4,7 +4,7 @@ SET
 	-- Replace the role 'admin' with the role 'owner'
 	rbac_roles = array_replace(rbac_roles, 'admin', 'owner')
 WHERE
-	-- Update the first user with the role 'admin'. This should be the first
+    -- Update the first user with the role 'admin'. This should be the first
     -- user ever, but if that user was demoted from an admin, then choose
     -- the next best user.
 	id = (SELECT id FROM users WHERE 'admin' = ANY(rbac_roles) ORDER BY created_at ASC LIMIT 1);
