fix(vet): query.cmd was always set to ":" (#2525)

thokra-nav · web-flow · commit 0150f7b6fd9a · 2023-07-26T08:09:58.000-07:00
Also update comment on Query message to list values without :
diff --git a/docs/howto/vet.md b/docs/howto/vet.md
@@ -29,7 +29,7 @@ message Query
   string sql = 1;
   // Name of the query
   string name = 2; 
-  // One of :many, :one, :exec, etc.
+  // One of "many", "one", "exec", etc.
   string cmd = 3;
   // Query parameters, if any
   repeated Parameter params = 4;
diff --git a/internal/cmd/vet.go b/internal/cmd/vet.go
@@ -446,7 +446,7 @@ func vetQuery(q *plugin.Query) *vet.Query {
 	return &vet.Query{
 		Sql:    q.Text,
 		Name:   q.Name,
-		Cmd:    strings.TrimPrefix(":", q.Cmd),
+		Cmd:    strings.TrimPrefix(q.Cmd, ":"),
 		Params: params,
 	}
 }
diff --git a/internal/endtoend/testdata/vet_failures/stderr.txt b/internal/endtoend/testdata/vet_failures/stderr.txt
@@ -4,3 +4,4 @@ query.sql: CreateAuthor: no-pg: invalid engine: postgresql
 query.sql: CreateAuthor: only-one-param: too many parameters
 query.sql: DeleteAuthor: no-pg: invalid engine: postgresql
 query.sql: DeleteAuthor: no-delete: don't use delete statements
+query.sql: DeleteAuthor: no-exec: don't use exec

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ func vetQuery(q plugin.Query) vet.Query {`
`446`	`446`	`return &vet.Query{`
`447`	`447`	`Sql: q.Text,`
`448`	`448`	`Name: q.Name,`
`449`		`- Cmd: strings.TrimPrefix(":", q.Cmd),`
	`449`	`+ Cmd: strings.TrimPrefix(q.Cmd, ":"),`
`450`	`450`	`Params: params,`
`451`	`451`	`}`
`452`	`452`	`}`