rebase and fix

Author: nickjackson

internal/codegen/golang/query.go

@@ -137,7 +137,7 @@ func (v QueryValue) Scan() string {
 
 		for _, e := range v.Struct.EmbedFields {
 			for _, f := range e.SubFields {
-				if strings.HasPrefix(f.Type, "[]") && f.Type != "[]byte" && v.SQLPackage != SQLPackagePGX {
+				if strings.HasPrefix(f.Type, "[]") && f.Type != "[]byte" && !v.SQLDriver.IsPGX() {
 					out = append(out, "pq.Array(&"+v.Name+"."+e.Name+"."+f.Name+")")
 				} else {
 					out = append(out, "&"+v.Name+"."+e.Name+"."+f.Name)