feat: add support for Postgres multi dimensional arrays in Go

internal/cmd/shim.go

@@ -166,10 +166,11 @@ func pluginCatalog(c *catalog.Catalog) *plugin.Catalog {
 						Schema:  c.Type.Schema,
 						Name:    c.Type.Name,
 					},
-					Comment: c.Comment,
-					NotNull: c.IsNotNull,
-					IsArray: c.IsArray,
-					Length:  int32(l),
+					Comment:     c.Comment,
+					NotNull:     c.IsNotNull,
+					IsArray:     c.IsArray,
+					ArrayBounds: int32(c.ArrayBounds),
+					Length:      int32(l),
 					Table: &plugin.Identifier{
 						Catalog: t.Rel.Catalog,
 						Schema:  t.Rel.Schema,
@@ -246,6 +247,7 @@ func pluginQueryColumn(c *compiler.Column) *plugin.Column {
 		Comment:      c.Comment,
 		NotNull:      c.NotNull,
 		IsArray:      c.IsArray,
+		ArrayBounds:  int32(c.ArrayBounds),
 		Length:       int32(l),
 		IsNamedParam: c.IsNamedParam,
 		IsFuncCall:   c.IsFuncCall,

internal/codegen/golang/go_type.go

@@ -38,7 +38,11 @@ func goType(req *plugin.CodeGenRequest, col *plugin.Column) string {
 	}
 	typ := goInnerType(req, col)
 	if col.IsArray || col.IsSqlcSlice {
-		return "[]" + typ
+		dims := ""
+		for i := int32(0); i < col.ArrayBounds; i++ {
+			dims += "[]"
+		}
+		return dims + typ
 	}
 	return typ
 }

internal/compiler/output_columns.go

@@ -26,12 +26,13 @@ func (c *Compiler) OutputColumns(stmt ast.Node) ([]*catalog.Column, error) {
 	catCols := make([]*catalog.Column, 0, len(cols))
 	for _, col := range cols {
 		catCols = append(catCols, &catalog.Column{
-			Name:      col.Name,
-			Type:      ast.TypeName{Name: col.DataType},
-			IsNotNull: col.NotNull,
-			IsArray:   col.IsArray,
-			Comment:   col.Comment,
-			Length:    col.Length,
+			Name:        col.Name,
+			Type:        ast.TypeName{Name: col.DataType},
+			IsNotNull:   col.NotNull,
+			IsArray:     col.IsArray,
+			ArrayBounds: col.ArrayBounds,
+			Comment:     col.Comment,
+			Length:      col.Length,
 		})
 	}
 	return catCols, nil
@@ -248,15 +249,16 @@ func outputColumns(qc *QueryCatalog, node ast.Node) ([]*Column, error) {
 							cname = *res.Name
 						}
 						cols = append(cols, &Column{
-							Name:       cname,
-							Type:       c.Type,
-							Scope:      scope,
-							Table:      c.Table,
-							TableAlias: t.Rel.Name,
-							DataType:   c.DataType,
-							NotNull:    c.NotNull,
-							IsArray:    c.IsArray,
-							Length:     c.Length,
+							Name:        cname,
+							Type:        c.Type,
+							Scope:       scope,
+							Table:       c.Table,
+							TableAlias:  t.Rel.Name,
+							DataType:    c.DataType,
+							NotNull:     c.NotNull,
+							IsArray:     c.IsArray,
+							ArrayBounds: c.ArrayBounds,
+							Length:      c.Length,
 						})
 					}
 				}
@@ -545,15 +547,16 @@ func outputColumnRefs(res *ast.ResTarget, tables []*Table, node *ast.ColumnRef)
 					cname = *res.Name
 				}
 				cols = append(cols, &Column{
-					Name:       cname,
-					Type:       c.Type,
-					Table:      c.Table,
-					TableAlias: alias,
-					DataType:   c.DataType,
-					NotNull:    c.NotNull,
-					IsArray:    c.IsArray,
-					Length:     c.Length,
-					EmbedTable: c.EmbedTable,
+					Name:        cname,
+					Type:        c.Type,
+					Table:       c.Table,
+					TableAlias:  alias,
+					DataType:    c.DataType,
+					NotNull:     c.NotNull,
+					IsArray:     c.IsArray,
+					ArrayBounds: c.ArrayBounds,
+					Length:      c.Length,
+					EmbedTable:  c.EmbedTable,
 				})
 			}
 		}

internal/compiler/query.go

@@ -19,6 +19,7 @@ type Column struct {
 	DataType     string
 	NotNull      bool
 	IsArray      bool
+	ArrayBounds  int
 	Comment      string
 	Length       *int
 	IsNamedParam bool

internal/compiler/query_catalog.go

@@ -52,13 +52,14 @@ func buildQueryCatalog(c *catalog.Catalog, node ast.Node, embeds rewrite.EmbedSe
 
 func ConvertColumn(rel *ast.TableName, c *catalog.Column) *Column {
 	return &Column{
-		Table:    rel,
-		Name:     c.Name,
-		DataType: dataType(&c.Type),
-		NotNull:  c.IsNotNull,
-		IsArray:  c.IsArray,
-		Type:     &c.Type,
-		Length:   c.Length,
+		Table:       rel,
+		Name:        c.Name,
+		DataType:    dataType(&c.Type),
+		NotNull:     c.IsNotNull,
+		IsArray:     c.IsArray,
+		ArrayBounds: c.ArrayBounds,
+		Type:        &c.Type,
+		Length:      c.Length,
 	}
 }
 

internal/compiler/resolve.go

@@ -215,6 +215,7 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 								DataType:     dataType(&c.Type),
 								NotNull:      p.NotNull(),
 								IsArray:      c.IsArray,
+								ArrayBounds:  c.ArrayBounds,
 								Length:       c.Length,
 								Table:        table,
 								IsNamedParam: isNamed,
@@ -274,6 +275,7 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 							DataType:     dataType(&c.Type),
 							NotNull:      p.NotNull(),
 							IsArray:      c.IsArray,
+							ArrayBounds:  c.ArrayBounds,
 							Table:        table,
 							IsNamedParam: isNamed,
 						},
@@ -445,6 +447,7 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 						DataType:     dataType(&c.Type),
 						NotNull:      p.NotNull(),
 						IsArray:      c.IsArray,
+						ArrayBounds:  c.ArrayBounds,
 						Table:        &ast.TableName{Schema: schema, Name: rel},
 						Length:       c.Length,
 						IsNamedParam: isNamed,
@@ -552,6 +555,7 @@ func (comp *Compiler) resolveCatalogRefs(qc *QueryCatalog, rvs []*ast.RangeVar,
 								DataType:     dataType(&c.Type),
 								NotNull:      c.IsNotNull,
 								IsArray:      c.IsArray,
+								ArrayBounds:  c.ArrayBounds,
 								Table:        table,
 								IsNamedParam: isNamed,
 								IsSqlcSlice:  p.IsSqlcSlice(),

internal/compiler/to_column.go

@@ -23,9 +23,10 @@ func toColumn(n *ast.TypeName) *Column {
 		panic("toColumn: " + err.Error())
 	}
 	return &Column{
-		Type:     typ,
-		DataType: strings.TrimPrefix(astutils.Join(n.Names, "."), "."),
-		NotNull:  true, // XXX: How do we know if this should be null?
-		IsArray:  isArray(n),
+		Type:        typ,
+		DataType:    strings.TrimPrefix(astutils.Join(n.Names, "."), "."),
+		NotNull:     true, // XXX: How do we know if this should be null?
+		IsArray:     isArray(n),
+		ArrayBounds: len(n.ArrayBounds.Items),
 	}
 }

internal/endtoend/testdata/multidimension_array/pgx/v4/query.sql

@@ -0,0 +1,4 @@
+CREATE TABLE bar (tags text[][] not null);
+
+-- name: TextArray :many
+SELECT * FROM bar;

internal/endtoend/testdata/multidimension_array/pgx/v4/sqlc.json

@@ -0,0 +1,13 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "sql_package": "pgx/v4",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}

internal/endtoend/testdata/multidimension_array/pgx/v5/query.sql

@@ -0,0 +1,4 @@
+CREATE TABLE bar (tags text[][] not null);
+
+-- name: TextArray :many
+SELECT * FROM bar;

internal/endtoend/testdata/multidimension_array/pgx/v5/sqlc.json

@@ -0,0 +1,13 @@
+{
+  "version": "1",
+  "packages": [
+    {
+      "path": "go",
+      "engine": "postgresql",
+      "sql_package": "pgx/v5",
+      "name": "querytest",
+      "schema": "query.sql",
+      "queries": "query.sql"
+    }
+  ]
+}