Skip to content

Commit 4684bef

Browse files
committed
fix(compiler): Pull in array information from analyzer
Fixes #1532
1 parent 0cfadb0 commit 4684bef

9 files changed

Lines changed: 105 additions & 0 deletions

File tree

‎internal/compiler/analyze.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ func combineAnalysis(prev *analysis, a *analyzer.Analysis) *analysis {
5858
if len(prev.Columns) == len(cols) {
5959
for i := range prev.Columns {
6060
prev.Columns[i].DataType = cols[i].DataType
61+
prev.Columns[i].IsArray = cols[i].IsArray
62+
prev.Columns[i].ArrayDims = cols[i].ArrayDims
6163
}
6264
} else {
6365
embedding := false
@@ -73,6 +75,8 @@ func combineAnalysis(prev *analysis, a *analyzer.Analysis) *analysis {
7375
if len(prev.Parameters) == len(params) {
7476
for i := range prev.Parameters {
7577
prev.Parameters[i].Column.DataType = params[i].Column.DataType
78+
prev.Parameters[i].Column.IsArray = params[i].Column.IsArray
79+
prev.Parameters[i].Column.ArrayDims = params[i].Column.ArrayDims
7680
}
7781
} else {
7882
prev.Parameters = params
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/sqlc-dev/sqlc/issues/1532
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"contexts": ["managed-db"]
3+
}

‎internal/endtoend/testdata/update_array_index/postgresql/pgx/go/db.go‎

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/update_array_index/postgresql/pgx/go/models.go‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎internal/endtoend/testdata/update_array_index/postgresql/pgx/go/query.sql.go‎

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
-- name: UpdateAuthor :one
2+
update authors
3+
set names[$1] = $2
4+
where id=$3
5+
RETURNING *;
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
CREATE TABLE authors (
2+
id BIGSERIAL PRIMARY KEY,
3+
names text[] NOT NULL
4+
);
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
version: "2"
2+
cloud:
3+
project: "01HAQMMECEYQYKFJN8MP16QC41"
4+
sql:
5+
- engine: "postgresql"
6+
schema: "schema.sql"
7+
queries: "query.sql"
8+
gen:
9+
go:
10+
package: "querytest"
11+
out: "go"
12+
sql_package: "pgx/v5"
13+
database:
14+
managed: true

0 commit comments

Comments
 (0)