Fix primitive array types inside a composite type (#63)

Previously, we would attempt to create a newArrayInit function, but instead we
can use the pgtype array variants, like pgtype.BoolArray.

example/acceptance_test.go

@@ -54,6 +54,8 @@ func TestExamples(t *testing.T) {
  args: []string{
  "--schema-glob", "example/composite/schema.sql",
  "--query-glob", "example/composite/query.sql",
+ "--go-type", "_bool=[]bool",
+ "--go-type", "bool=bool",
  "--go-type", "int8=int",
  "--go-type", "int4=int",
  "--go-type", "text=string",
@@ -71,6 +73,8 @@ func TestExamples(t *testing.T) {
  args: []string{
  "--schema-glob", "example/slices/schema.sql",
  "--query-glob", "example/slices/query.sql",
+ "--go-type", "_bool=[]bool",
+ "--go-type", "bool=bool",
  "--go-type", "timestamp=*time.Time",
  "--go-type", "_timestamp=[]*time.Time",
  "--go-type", "timestamptz=*time.Time",

example/composite/codegen_test.go

@@ -22,9 +22,11 @@ func TestGenerate_Go_Example_Composite(t *testing.T) {
  GoPackage: "composite",
  Language: pggen.LangGo,
  TypeOverrides: map[string]string{
- "int4": "int",
- "int8": "int",
- "text": "string",
+ "_bool": "[]bool",
+ "bool": "bool",
+ "int8": "int",
+ "int4": "int",
+ "text": "string",
  },
  })
  if err != nil {

example/composite/query.sql

@@ -28,3 +28,7 @@ INSERT
 INTO blocks (screenshot_id, body)
 VALUES (pggen.arg('ScreenshotID'), pggen.arg('Body'))
 RETURNING id, screenshot_id, body;
+
+
+-- name: ArraysInput :one
+SELECT pggen.arg('arrays')::arrays;

example/composite/query.sql_test.go

@@ -3,8 +3,10 @@ package composite
 import (
  "context"
  "github.com/jackc/pgx/v4"
+ "github.com/jschaf/pggen/internal/difftest"
  "github.com/jschaf/pggen/internal/errs"
  "github.com/jschaf/pggen/internal/pgtest"
+ "github.com/jschaf/pggen/internal/ptrs"
  "github.com/stretchr/testify/assert"
  "github.com/stretchr/testify/require"
  "testing"
@@ -85,6 +87,25 @@ func TestNewQuerier_SearchScreenshots(t *testing.T) {
  })
 }
 
+func TestNewQuerier_ArraysInput(t *testing.T) {
+ conn, cleanup := pgtest.NewPostgresSchema(t, []string{"schema.sql"})
+ defer cleanup()
+
+ q := NewQuerier(conn)
+
+ t.Run("ArraysInput", func(t *testing.T) {
+ want := Arrays{
+ Texts: []string{"foo", "bar"},
+ Int8s: []*int{ptrs.NewInt(1), ptrs.NewInt(2), ptrs.NewInt(3)},
+ Bools: []bool{true, true, false},
+ Floats: []*float64{ptrs.NewFloat64(33.3), ptrs.NewFloat64(66.6)},
+ }
+ got, err := q.ArraysInput(context.Background(), want)
+ require.NoError(t, err)
+ difftest.AssertSame(t, want, got)
+ })
+}
+
 func insertScreenshotBlock(t *testing.T, q *DBQuerier, screenID int, body string) InsertScreenshotBlocksRow {
  t.Helper()
  row, err := q.InsertScreenshotBlocks(context.Background(), screenID, body)

example/composite/schema.sql

@@ -7,3 +7,10 @@ CREATE TABLE blocks (
  screenshot_id bigint NOT NULL REFERENCES screenshots (id),
  body text NOT NULL
 );
+
+CREATE TYPE arrays AS (
+ texts text[],
+ int8s int8[],
+ bools boolean[],
+ floats float8[]
+);

example/slices/codegen_test.go

@@ -23,6 +23,8 @@ func TestGenerate_Go_Example_Slices(t *testing.T) {
  GoPackage: "slices",
  Language: pggen.LangGo,
  TypeOverrides: map[string]string{
+ "_bool": "[]bool",
+ "bool": "bool",
  "timestamp": "*time.Time",
  "_timestamp": "[]*time.Time",
  "timestamptz": "*time.Time",

example/slices/query.sql

@@ -1,3 +1,6 @@
+-- name: GetBools :one
+SELECT pggen.arg('data')::boolean[];
+
 -- name: GetOneTimestamp :one
 SELECT pggen.arg('data')::timestamp;
 

example/slices/query.sql_test.go

@@ -11,6 +11,32 @@ import (
  "time"
 )
 
+func TestNewQuerier_GetBools(t *testing.T) {
+ ctx := context.Background()
+ conn, cleanup := pgtest.NewPostgresSchema(t, []string{"schema.sql"})
+ defer cleanup()
+
+ q := NewQuerier(conn)
+
+ t.Run("GetBools", func(t *testing.T) {
+ want := []bool{true, true, false}
+ got, err := q.GetBools(ctx, want)
+ require.NoError(t, err)
+ difftest.AssertSame(t, want, got)
+ })
+
+ t.Run("GetBoolsBatch", func(t *testing.T) {
+ batch := &pgx.Batch{}
+ want := []bool{true, true, false}
+ q.GetBoolsBatch(batch, want)
+ results := conn.SendBatch(ctx, batch)
+ defer errs.CaptureT(t, results.Close, "close batch results")
+ got, err := q.GetBoolsScan(results)
+ require.NoError(t, err)
+ difftest.AssertSame(t, want, got)
+ })
+}
+
 func TestNewQuerier_GetOneTimestamp(t *testing.T) {
  ctx := context.Background()
  conn, cleanup := pgtest.NewPostgresSchema(t, []string{"schema.sql"})