codegen/golang: Make sure to import net package (#858)

Add a map of known types to always check

Author: kyleconroy

internal/codegen/golang/imports.go

@@ -111,6 +111,13 @@ func (i *importer) dbImports() fileImports {
 	return fileImports{Std: std}
 }
 
+var stdlibTypes = map[string]string{
+	"json.RawMessage":  "encoding/json",
+	"time.Time":        "time",
+	"net.IP":           "net",
+	"net.HardwareAddr": "net",
+}
+
 func (i *importer) interfaceImports() fileImports {
 	uses := func(name string) bool {
 		for _, q := range i.Queries {
@@ -139,17 +146,10 @@ func (i *importer) interfaceImports() fileImports {
 			std["database/sql"] = struct{}{}
 		}
 	}
-	if uses("json.RawMessage") {
-		std["encoding/json"] = struct{}{}
-	}
-	if uses("time.Time") {
-		std["time"] = struct{}{}
-	}
-	if uses("net.IP") {
-		std["net"] = struct{}{}
-	}
-	if uses("net.HardwareAddr") {
-		std["net"] = struct{}{}
+	for typeName, pkg := range stdlibTypes {
+		if uses(typeName) {
+			std[pkg] = struct{}{}
+		}
 	}
 
 	pkg := make(map[ImportSpec]struct{})
@@ -202,17 +202,10 @@ func (i *importer) modelImports() fileImports {
 	if i.usesType("sql.Null") {
 		std["database/sql"] = struct{}{}
 	}
-	if i.usesType("json.RawMessage") {
-		std["encoding/json"] = struct{}{}
-	}
-	if i.usesType("time.Time") {
-		std["time"] = struct{}{}
-	}
-	if i.usesType("net.IP") {
-		std["net"] = struct{}{}
-	}
-	if i.usesType("net.HardwareAddr") {
-		std["net"] = struct{}{}
+	for typeName, pkg := range stdlibTypes {
+		if i.usesType(typeName) {
+			std[pkg] = struct{}{}
+		}
 	}
 	if len(i.Enums) > 0 {
 		std["fmt"] = struct{}{}
@@ -347,14 +340,10 @@ func (i *importer) queryImports(filename string) fileImports {
 			std["database/sql"] = struct{}{}
 		}
 	}
-	if uses("json.RawMessage") {
-		std["encoding/json"] = struct{}{}
-	}
-	if uses("time.Time") {
-		std["time"] = struct{}{}
-	}
-	if uses("net.IP") {
-		std["net"] = struct{}{}
+	for typeName, pkg := range stdlibTypes {
+		if uses(typeName) {
+			std[pkg] = struct{}{}
+		}
 	}
 
 	pkg := make(map[ImportSpec]struct{})

internal/endtoend/testdata/macaddr/go/query.sql.go

@@ -2,3 +2,6 @@ CREATE TABLE foo (bar bool not null, addr macaddr not null);
 
 -- name: Get :many
 SELECT bar, addr FROM foo LIMIT $1;
+
+-- name: GetAddr :many
+SELECT addr FROM foo LIMIT $1;