diff --git a/internal/codegen/golang/go_type.go b/internal/codegen/golang/go_type.go index d740047cef..77415e69af 100644 --- a/internal/codegen/golang/go_type.go +++ b/internal/codegen/golang/go_type.go @@ -38,9 +38,6 @@ func goType(req *plugin.CodeGenRequest, col *plugin.Column) string { } typ := goInnerType(req, col) if col.IsArray { - if parseDriver(req.Settings.Go.SqlPackage) == SQLDriverPGXV5 { - return "pgtype.Array[" + typ + "]" - } return "[]" + typ } return typ diff --git a/internal/endtoend/testdata/any/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/any/pgx/v5/go/query.sql.go index 3059ad745f..f9cb60d289 100644 --- a/internal/endtoend/testdata/any/pgx/v5/go/query.sql.go +++ b/internal/endtoend/testdata/any/pgx/v5/go/query.sql.go @@ -7,8 +7,6 @@ package querytest import ( "context" - - "github.com/jackc/pgx/v5/pgtype" ) const any = `-- name: Any :many @@ -17,7 +15,7 @@ FROM bar WHERE foo = ANY($1::bigserial[]) ` -func (q *Queries) Any(ctx context.Context, dollar_1 pgtype.Array[int64]) ([]int64, error) { +func (q *Queries) Any(ctx context.Context, dollar_1 []int64) ([]int64, error) { rows, err := q.db.Query(ctx, any, dollar_1) if err != nil { return nil, err diff --git a/internal/endtoend/testdata/array_text/pgx/v5/go/models.go b/internal/endtoend/testdata/array_text/pgx/v5/go/models.go index 1cbf3edf64..b85ea5db1f 100644 --- a/internal/endtoend/testdata/array_text/pgx/v5/go/models.go +++ b/internal/endtoend/testdata/array_text/pgx/v5/go/models.go @@ -4,10 +4,8 @@ package querytest -import ( - "github.com/jackc/pgx/v5/pgtype" -) +import () type Bar struct { - Tags pgtype.Array[string] + Tags []string } diff --git a/internal/endtoend/testdata/array_text/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/array_text/pgx/v5/go/query.sql.go index 9ddd40f8dd..3695dbc92e 100644 --- a/internal/endtoend/testdata/array_text/pgx/v5/go/query.sql.go +++ b/internal/endtoend/testdata/array_text/pgx/v5/go/query.sql.go @@ -7,23 +7,21 @@ package querytest import ( "context" - - "github.com/jackc/pgx/v5/pgtype" ) const textArray = `-- name: TextArray :many SELECT tags FROM bar ` -func (q *Queries) TextArray(ctx context.Context) ([]pgtype.Array[string], error) { +func (q *Queries) TextArray(ctx context.Context) ([][]string, error) { rows, err := q.db.Query(ctx, textArray) if err != nil { return nil, err } defer rows.Close() - var items []pgtype.Array[string] + var items [][]string for rows.Next() { - var tags pgtype.Array[string] + var tags []string if err := rows.Scan(&tags); err != nil { return nil, err } diff --git a/internal/endtoend/testdata/array_text_join/pgx/v5/go/models.go b/internal/endtoend/testdata/array_text_join/pgx/v5/go/models.go index e3354fdc58..20d377ec70 100644 --- a/internal/endtoend/testdata/array_text_join/pgx/v5/go/models.go +++ b/internal/endtoend/testdata/array_text_join/pgx/v5/go/models.go @@ -4,13 +4,11 @@ package querytest -import ( - "github.com/jackc/pgx/v5/pgtype" -) +import () type Bar struct { ID string - Info pgtype.Array[string] + Info []string } type Foo struct { diff --git a/internal/endtoend/testdata/array_text_join/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/array_text_join/pgx/v5/go/query.sql.go index 16eb3b6a42..2f97529927 100644 --- a/internal/endtoend/testdata/array_text_join/pgx/v5/go/query.sql.go +++ b/internal/endtoend/testdata/array_text_join/pgx/v5/go/query.sql.go @@ -7,8 +7,6 @@ package querytest import ( "context" - - "github.com/jackc/pgx/v5/pgtype" ) const joinTextArray = `-- name: JoinTextArray :many @@ -17,15 +15,15 @@ FROM foo JOIN bar ON foo.bar = bar.id ` -func (q *Queries) JoinTextArray(ctx context.Context) ([]pgtype.Array[string], error) { +func (q *Queries) JoinTextArray(ctx context.Context) ([][]string, error) { rows, err := q.db.Query(ctx, joinTextArray) if err != nil { return nil, err } defer rows.Close() - var items []pgtype.Array[string] + var items [][]string for rows.Next() { - var info pgtype.Array[string] + var info []string if err := rows.Scan(&info); err != nil { return nil, err } diff --git a/internal/endtoend/testdata/ddl_alter_table_alter_type/postgresql/pgx/v5/go/models.go b/internal/endtoend/testdata/ddl_alter_table_alter_type/postgresql/pgx/v5/go/models.go index c78bbe4288..40bafb90e4 100644 --- a/internal/endtoend/testdata/ddl_alter_table_alter_type/postgresql/pgx/v5/go/models.go +++ b/internal/endtoend/testdata/ddl_alter_table_alter_type/postgresql/pgx/v5/go/models.go @@ -4,10 +4,8 @@ package querytest -import ( - "github.com/jackc/pgx/v5/pgtype" -) +import () type Foo struct { - Bar pgtype.Array[string] + Bar []string } diff --git a/internal/endtoend/testdata/exec_imports/pgx/v5/go/models.go b/internal/endtoend/testdata/exec_imports/pgx/v5/go/models.go index d130486f76..2028fcd175 100644 --- a/internal/endtoend/testdata/exec_imports/pgx/v5/go/models.go +++ b/internal/endtoend/testdata/exec_imports/pgx/v5/go/models.go @@ -10,5 +10,5 @@ import ( type Foo struct { Bar pgtype.Int4 - Bars pgtype.Array[int32] + Bars []int32 } diff --git a/internal/endtoend/testdata/overrides/postgresql/pgx/v5/go/models.go b/internal/endtoend/testdata/overrides/postgresql/pgx/v5/go/models.go index d8e5227b7a..349d5b4bad 100644 --- a/internal/endtoend/testdata/overrides/postgresql/pgx/v5/go/models.go +++ b/internal/endtoend/testdata/overrides/postgresql/pgx/v5/go/models.go @@ -5,7 +5,6 @@ package override import ( - "github.com/jackc/pgx/v5/pgtype" "github.com/kyleconroy/sqlc-testdata/pkg" "github.com/lib/pq" ) @@ -13,7 +12,7 @@ import ( type Foo struct { Other string Total int64 - Tags pgtype.Array[string] + Tags []string ByteSeq []byte Retyped pkg.CustomType Langs pq.StringArray diff --git a/internal/endtoend/testdata/select_text_array/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/select_text_array/pgx/v5/go/query.sql.go index 51714688e3..a535ca5ddc 100644 --- a/internal/endtoend/testdata/select_text_array/pgx/v5/go/query.sql.go +++ b/internal/endtoend/testdata/select_text_array/pgx/v5/go/query.sql.go @@ -7,23 +7,21 @@ package querytest import ( "context" - - "github.com/jackc/pgx/v5/pgtype" ) const selectTextArray = `-- name: SelectTextArray :many SELECT $1::TEXT[] ` -func (q *Queries) SelectTextArray(ctx context.Context, dollar_1 pgtype.Array[string]) ([]pgtype.Array[string], error) { +func (q *Queries) SelectTextArray(ctx context.Context, dollar_1 []string) ([][]string, error) { rows, err := q.db.Query(ctx, selectTextArray, dollar_1) if err != nil { return nil, err } defer rows.Close() - var items []pgtype.Array[string] + var items [][]string for rows.Next() { - var column_1 pgtype.Array[string] + var column_1 []string if err := rows.Scan(&column_1); err != nil { return nil, err } diff --git a/internal/endtoend/testdata/unnest/postgresql/pgx/v5/go/querier.go b/internal/endtoend/testdata/unnest/postgresql/pgx/v5/go/querier.go index f95485da84..a72b2f1d1a 100644 --- a/internal/endtoend/testdata/unnest/postgresql/pgx/v5/go/querier.go +++ b/internal/endtoend/testdata/unnest/postgresql/pgx/v5/go/querier.go @@ -11,7 +11,7 @@ import ( ) type Querier interface { - CreateMemories(ctx context.Context, vampireID pgtype.Array[pgtype.UUID]) ([]Memory, error) + CreateMemories(ctx context.Context, vampireID []pgtype.UUID) ([]Memory, error) } var _ Querier = (*Queries)(nil) diff --git a/internal/endtoend/testdata/unnest/postgresql/pgx/v5/go/query.sql.go b/internal/endtoend/testdata/unnest/postgresql/pgx/v5/go/query.sql.go index 14dcac7394..3739a07675 100644 --- a/internal/endtoend/testdata/unnest/postgresql/pgx/v5/go/query.sql.go +++ b/internal/endtoend/testdata/unnest/postgresql/pgx/v5/go/query.sql.go @@ -19,7 +19,7 @@ RETURNING id, vampire_id, created_at, updated_at ` -func (q *Queries) CreateMemories(ctx context.Context, vampireID pgtype.Array[pgtype.UUID]) ([]Memory, error) { +func (q *Queries) CreateMemories(ctx context.Context, vampireID []pgtype.UUID) ([]Memory, error) { rows, err := q.db.Query(ctx, createMemories, vampireID) if err != nil { return nil, err