fix(codegen/golang): fix sqlc.embed to work with pq.Array (#2544)

* fix(codegen/golang): fix sqlc.embed to work with pq.Array wrap

close #2458

* test: add endtoend

Author: orisano

internal/codegen/golang/field.go

@@ -17,7 +17,7 @@ type Field struct {
 	Comment string
 	Column  *plugin.Column
 	// EmbedFields contains the embedded fields that require scanning.
-	EmbedFields []string
+	EmbedFields []Field
 }
 
 func (gf Field) Tag() string {

internal/codegen/golang/imports.go

@@ -334,6 +334,11 @@ func (i *importer) queryImports(filename string) fileImports {
 						if strings.HasPrefix(f.Type, "[]") && f.Type != "[]byte" {
 							return true
 						}
+						for _, embed := range f.EmbedFields {
+							if strings.HasPrefix(embed.Type, "[]") && embed.Type != "[]byte" {
+								return true
+							}
+						}
 					}
 				} else {
 					if strings.HasPrefix(q.Ret.Type(), "[]") && q.Ret.Type() != "[]byte" {

internal/codegen/golang/query.go

@@ -179,7 +179,11 @@ func (v QueryValue) Scan() string {
 			// append any embedded fields
 			if len(f.EmbedFields) > 0 {
 				for _, embed := range f.EmbedFields {
-					out = append(out, "&"+v.Name+"."+f.Name+"."+embed)
+					if strings.HasPrefix(embed.Type, "[]") && embed.Type != "[]byte" && !v.SQLDriver.IsPGX() {
+						out = append(out, "pq.Array(&"+v.Name+"."+f.Name+"."+embed.Name+")")
+					} else {
+						out = append(out, "&"+v.Name+"."+f.Name+"."+embed.Name)
+					}
 				}
 				continue
 			}

internal/codegen/golang/result.go

@@ -117,7 +117,7 @@ type goColumn struct {
 type goEmbed struct {
 	modelType string
 	modelName string
-	fields    []string
+	fields    []Field
 }
 
 // look through all the structs and attempt to find a matching one to embed
@@ -138,9 +138,9 @@ func newGoEmbed(embed *plugin.Identifier, structs []Struct, defaultSchema string
 			continue
 		}
 
-		fields := make([]string, len(s.Fields))
+		fields := make([]Field, len(s.Fields))
 		for i, f := range s.Fields {
-			fields[i] = f.Name
+			fields[i] = f
 		}
 
 		return &goEmbed{

internal/endtoend/testdata/sqlc_embed/postgresql/stdlib/go/models.go

@@ -8,7 +8,8 @@ CREATE TABLE users (
 
 CREATE TABLE posts (
     id integer NOT NULL PRIMARY KEY,
-    user_id integer NOT NULL
+    user_id integer NOT NULL,
+    likes integer[] NOT NULL
 );
 
 CREATE TABLE baz.users (