Merge #152931

craig[bot] · xinhaoz · craig[bot] · commit 7b65b179304f · 2025-09-03T21:57:07.000Z
152931: server: fix error msg for malformed table id in getTableGrants r=xinhaoz a=xinhaoz

Epic: none

Co-authored-by: Xin Hao Zhang &lt;xzhang@cockroachlabs.com&gt;
diff --git a/pkg/server/api_v2_grants.go b/pkg/server/api_v2_grants.go
@@ -300,7 +300,7 @@ func (a *apiV2Server) getTableGrants(w http.ResponseWriter, r *http.Request) {
 	pathVars := mux.Vars(r)
 	tableId, err := strconv.Atoi(pathVars[tableIdPathVar])
 	if err != nil {
-		http.Error(w, "invalid database id", http.StatusBadRequest)
+		http.Error(w, "invalid table id", http.StatusBadRequest)
 		return
 	}
 	queryValues := r.URL.Query()

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ func (a apiV2Server) getTableGrants(w http.ResponseWriter, r http.Request) {`
`300`	`300`	`pathVars := mux.Vars(r)`
`301`	`301`	`tableId, err := strconv.Atoi(pathVars[tableIdPathVar])`
`302`	`302`	`if err != nil {`
`303`		`- http.Error(w, "invalid database id", http.StatusBadRequest)`
	`303`	`+ http.Error(w, "invalid table id", http.StatusBadRequest)`
`304`	`304`	`return`
`305`	`305`	`}`
`306`	`306`	`queryValues := r.URL.Query()`