coder
diff --git a/‎coderd/database/querier.go
Lines changed: 1 addition & 1 deletion b/‎coderd/database/querier.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎coderd/database/queries.sql.go
Lines changed: 9 additions & 4 deletions b/‎coderd/database/queries.sql.go
Lines changed: 9 additions & 4 deletions
diff --git a/‎coderd/database/queries/workspaces.sql
Lines changed: 3 additions & 1 deletion b/‎coderd/database/queries/workspaces.sql
Lines changed: 3 additions & 1 deletion
diff --git a/‎coderd/workspaces.go
Lines changed: 13 additions & 14 deletions b/‎coderd/workspaces.go
Lines changed: 13 additions & 14 deletions
@@ -112,13 +112,15 @@ SET
 WHERE
 	id = $1;
 
--- name: UpdateWorkspace :exec
+-- name: UpdateWorkspace :execrows
 UPDATE
 	workspaces
 SET
 	name = $2
 WHERE
 	id = $1
+	-- This can result in rows affected being zero, the caller should
+	-- handle this case.
 	AND deleted = false;
 
 -- name: UpdateWorkspaceAutostart :exec
 
@@ -501,24 +501,11 @@ func (api *API) patchWorkspace(rw http.ResponseWriter, r *http.Request) {
 		name = req.Name
 	}
 
-	err := api.Database.UpdateWorkspace(r.Context(), database.UpdateWorkspaceParams{
+	n, err := api.Database.UpdateWorkspace(r.Context(), database.UpdateWorkspaceParams{
 		ID:   workspace.ID,
 		Name: name,
 	})
 	if err != nil {
-		// The query protects against updating deleted workspaces and
-		// the existence of the workspace is checked in the request,
-		// the only conclusion we can make is that we're trying to
-		// update a deleted workspace.
-		//
-		// We could do this check earlier but since we're not in a
-		// transaction, it's pointless.
-		if errors.Is(err, sql.ErrNoRows) {
-			httpapi.Write(rw, http.StatusMethodNotAllowed, codersdk.Response{
-				Message: fmt.Sprintf("Workspace %q is deleted and cannot be updated.", workspace.Name),
-			})
-			return
-		}
 		// Check if the name was already in use.
 		if database.IsUniqueViolation(err, database.UniqueWorkspacesOwnerIDLowerIdx) {
 			httpapi.Write(rw, http.StatusConflict, codersdk.Response{
@@ -536,6 +523,18 @@ func (api *API) patchWorkspace(rw http.ResponseWriter, r *http.Request) {
 		})
 		return
 	}
+	// If no rows were affected, the workspace must have been deleted
+	// between the start of the request and the query updating the
+	// workspace name.
+	//
+	// We could do this check earlier but we'd have to start a
+	// transaction to ensure consistency.
+	if n == 0 {
+		httpapi.Write(rw, http.StatusMethodNotAllowed, codersdk.Response{
+			Message: fmt.Sprintf("Workspace %q is deleted and cannot be updated.", workspace.Name),
+		})
+		return
+	}
 
 	rw.WriteHeader(http.StatusNoContent)
 }