fix: batch imports filter queries, update cmds having ret type (#1842)

Author: chrisyxlee

examples/batch/postgresql/batch.go

@@ -2,6 +2,10 @@
 SELECT * FROM authors
 WHERE author_id = $1;
 
+-- name: DeleteBookExecResult :execresult
+DELETE FROM books
+WHERE book_id = $1;
+
 -- name: DeleteBook :batchexec
 DELETE FROM books
 WHERE book_id = $1;
@@ -38,3 +42,7 @@ RETURNING *;
 UPDATE books
 SET title = $1, tags = $2
 WHERE book_id = $3;
+
+-- name: GetBiography :batchone
+SELECT biography FROM authors
+WHERE author_id = $1;

examples/batch/postgresql/models.go

@@ -1,6 +1,7 @@
 CREATE TABLE authors (
           author_id SERIAL PRIMARY KEY,
-          name text NOT NULL DEFAULT ''
+          name text NOT NULL DEFAULT '',
+          biography JSONB
 );
 
 CREATE TYPE book_type AS ENUM (

examples/batch/postgresql/querier.go

@@ -239,6 +239,9 @@ func (i *importer) interfaceImports() fileImports {
 	std, pkg := buildImports(i.Settings, i.Queries, func(name string) bool {
 		for _, q := range i.Queries {
 			if q.hasRetType() {
+				if usesBatch([]Query{q}) {
+					continue
+				}
 				if strings.HasPrefix(q.Ret.Type(), name) {
 					return true
 				}
@@ -407,11 +410,14 @@ func (i *importer) copyfromImports() fileImports {
 }
 
 func (i *importer) batchImports(filename string) fileImports {
-	std, pkg := buildImports(i.Settings, i.Queries, func(name string) bool {
-		for _, q := range i.Queries {
-			if !usesBatch([]Query{q}) {
-				continue
-			}
+	batchQueries := make([]Query, 0, len(i.Queries))
+	for _, q := range i.Queries {
+		if usesBatch([]Query{q}) {
+			batchQueries = append(batchQueries, q)
+		}
+	}
+	std, pkg := buildImports(i.Settings, batchQueries, func(name string) bool {
+		for _, q := range batchQueries {
 			if q.hasRetType() {
 				if q.Ret.EmitStruct() {
 					for _, f := range q.Ret.Struct.Fields {

examples/batch/postgresql/query.sql

@@ -165,7 +165,8 @@ type Query struct {
 }
 
 func (q Query) hasRetType() bool {
-	scanned := q.Cmd == metadata.CmdOne || q.Cmd == metadata.CmdMany
+	scanned := q.Cmd == metadata.CmdOne || q.Cmd == metadata.CmdMany ||
+		q.Cmd == metadata.CmdBatchMany || q.Cmd == metadata.CmdBatchOne
 	return scanned && !q.Ret.isEmpty()
 }