codegen: Fix errant database/sql imports (#789)

kyleconroy · web-flow · commit 0823f5fbfa90 · 2020-11-16T23:02:32.000-08:00
* codegen: Fix errant database/sql imports

Map return type of void to interface{}, not sql.NullBool

* remove debug

* actually test the import fix
diff --git a/internal/codegen/golang/postgresql_type.go b/internal/codegen/golang/postgresql_type.go
@@ -129,9 +129,8 @@ func postgresType(r *compiler.Result, col *compiler.Column, settings config.Comb
 		return "sql.NullInt64"
 
 	case "void":
-		// A void value always returns NULL. Since there is no built-in NULL
-		// value into the SQL package, we'll use sql.NullBool
-		return "sql.NullBool"
+		// A void value can only be scanned into an empty interface.
+		return "interface{}"
 
 	case "any":
 		return "interface{}"
diff --git a/internal/codegen/golang/query.go b/internal/codegen/golang/query.go
@@ -1,6 +1,10 @@
 package golang
 
-import "strings"
+import (
+	"strings"
+
+	"github.com/kyleconroy/sqlc/internal/metadata"
+)
 
 type QueryValue struct {
 	Emit   bool
@@ -103,5 +107,6 @@ type Query struct {
 }
 
 func (q Query) hasRetType() bool {
-	return q.Cmd != ":exec" && !q.Ret.isEmpty()
+	scanned := q.Cmd == metadata.CmdOne || q.Cmd == metadata.CmdMany
+	return scanned && !q.Ret.isEmpty()
 }
diff --git a/internal/endtoend/testdata/pg_advisory_xact_lock/exec.sql b/internal/endtoend/testdata/pg_advisory_xact_lock/exec.sql
@@ -0,0 +1,5 @@
+-- name: AdvisoryLockExec :exec
+SELECT pg_advisory_lock($1);
+
+-- name: AdvisoryLockExecRows :execrows
+SELECT pg_advisory_lock($1);
diff --git a/internal/endtoend/testdata/pg_advisory_xact_lock/go/exec.sql.go b/internal/endtoend/testdata/pg_advisory_xact_lock/go/exec.sql.go
diff --git a/internal/endtoend/testdata/pg_advisory_xact_lock/go/query.sql.go b/internal/endtoend/testdata/pg_advisory_xact_lock/go/query.sql.go
diff --git a/internal/endtoend/testdata/pg_advisory_xact_lock/query.sql b/internal/endtoend/testdata/pg_advisory_xact_lock/query.sql
@@ -1,2 +1,8 @@
--- name: AdvisoryLock :many
+-- name: AdvisoryLockOne :one
+SELECT pg_advisory_lock($1);
+
+-- name: AdvisoryUnlock :many
 SELECT pg_advisory_unlock($1);
+
+-- name: AdvisoryLockExecResult :execresult
+SELECT pg_advisory_lock($1);
diff --git a/internal/endtoend/testdata/pg_advisory_xact_lock/sqlc.json b/internal/endtoend/testdata/pg_advisory_xact_lock/sqlc.json
@@ -5,7 +5,7 @@
       "path": "go",
       "name": "querytest",
       "schema": "query.sql",
-      "queries": "query.sql"
+      "queries": ["query.sql", "exec.sql"]
     }
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"path": "go",`
`6`	`6`	`"name": "querytest",`
`7`	`7`	`"schema": "query.sql",`
`8`		`- "queries": "query.sql"`
	`8`	`+ "queries": ["query.sql", "exec.sql"]`
`9`	`9`	`}`
`10`	`10`	`]`
`11`	`11`	`}`