From d1ba54e5a85b0820d1ef35525887ed6c8b1eaae1 Mon Sep 17 00:00:00 2001 From: xen0l <1426772+xen0l@users.noreply.github.com> Date: Sat, 24 Oct 2026 21:57:51 +0000 Subject: [PATCH] fix(core): resolve a struct field through its column typeColumnRef read only the first two parts of a column reference. For i.info.label it resolved the column info and dropped label, so the result had the type of the whole struct. For info.label it looked for a relation named info and reported an unknown column. Resolve the first part as a column when it is not a relation, then walk the remaining parts as fields of the column's struct type. A field is nullable and has no source column. An unknown field is an error. Adds the duckdb_struct_field end-to-end case. --- internal/core/analyzer/expr.go | 44 ++++++- .../duckdb_struct_field/duckdb/exec.json | 1 + .../duckdb_struct_field/duckdb/go/db.go | 31 +++++ .../duckdb_struct_field/duckdb/go/models.go | 10 ++ .../duckdb/go/query.sql.go | 124 ++++++++++++++++++ .../duckdb_struct_field/duckdb/query.sql | 11 ++ .../duckdb_struct_field/duckdb/schema.sql | 4 + .../duckdb_struct_field/duckdb/sqlc.yaml | 10 ++ 8 files changed, 234 insertions(+), 1 deletion(-) create mode 100644 internal/endtoend/testdata/duckdb_struct_field/duckdb/exec.json create mode 100644 internal/endtoend/testdata/duckdb_struct_field/duckdb/go/db.go create mode 100644 internal/endtoend/testdata/duckdb_struct_field/duckdb/go/models.go create mode 100644 internal/endtoend/testdata/duckdb_struct_field/duckdb/go/query.sql.go create mode 100644 internal/endtoend/testdata/duckdb_struct_field/duckdb/query.sql create mode 100644 internal/endtoend/testdata/duckdb_struct_field/duckdb/schema.sql create mode 100644 internal/endtoend/testdata/duckdb_struct_field/duckdb/sqlc.yaml diff --git a/internal/core/analyzer/expr.go b/internal/core/analyzer/expr.go index 62a69b273d..e759460170 100644 --- a/internal/core/analyzer/expr.go +++ b/internal/core/analyzer/expr.go @@ -164,6 +164,11 @@ func (a *analyzer) typeColumnRef(c *ast.ColumnRef) (exprType, error) { if err != nil { return exprType{}, err } + // Parts after relation.column name fields of a struct column. + var fields []string + if ok && len(parts) > 2 { + fields = parts[2:] + } // A dotted name may be a column's own, as ClickHouse names the columns // a Nested column stores as n.a. if !ok && relation != "" { @@ -172,6 +177,17 @@ func (a *analyzer) typeColumnRef(c *ast.ColumnRef) (exprType, error) { return exprType{}, err } } + // Otherwise the first part may be a struct column and the rest its + // fields: info.label, when info is no relation in scope. + if !ok && relation != "" { + rel, col, ok, err = a.resolveColumn("", relation) + if err != nil { + return exprType{}, err + } + if ok { + fields = parts[1:] + } + } if !ok { if relation != "" { return exprType{}, fmt.Errorf("unknown column %q.%q", relation, column) @@ -183,7 +199,33 @@ func (a *analyzer) typeColumnRef(c *ast.ColumnRef) (exprType, error) { } return exprType{}, fmt.Errorf("unknown column %q", column) } - return columnType(rel, col), nil + t := columnType(rel, col) + for _, field := range fields { + f, ok := a.structField(t, field) + if !ok { + return exprType{}, fmt.Errorf("unknown field %q of column %q", field, col.Name) + } + t = f + } + return t, nil +} + +// structField is the type of a field of a struct-typed expression. A field +// is never a column of a relation, so the result carries no source column, +// and it is nullable because a struct field can hold NULL. +func (a *analyzer) structField(t exprType, field string) (exprType, bool) { + e := a.exprOf(t) + if e == nil || e.Name != "struct" { + return exprType{}, false + } + for _, arg := range e.Args { + if arg.Type != nil && strings.EqualFold(arg.Label, field) { + out := a.lookupType(arg.Type) + out.nullable = true + return out, true + } + } + return exprType{}, false } func flattenFields(fields *ast.List) []string { diff --git a/internal/endtoend/testdata/duckdb_struct_field/duckdb/exec.json b/internal/endtoend/testdata/duckdb_struct_field/duckdb/exec.json new file mode 100644 index 0000000000..f4e21983b6 --- /dev/null +++ b/internal/endtoend/testdata/duckdb_struct_field/duckdb/exec.json @@ -0,0 +1 @@ +{"contexts": ["base"]} diff --git a/internal/endtoend/testdata/duckdb_struct_field/duckdb/go/db.go b/internal/endtoend/testdata/duckdb_struct_field/duckdb/go/db.go new file mode 100644 index 0000000000..32faa9f2b8 --- /dev/null +++ b/internal/endtoend/testdata/duckdb_struct_field/duckdb/go/db.go @@ -0,0 +1,31 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.31.1 + +package querytest + +import ( + "context" + "database/sql" +) + +type DBTX interface { + ExecContext(context.Context, string, ...any) (sql.Result, error) + PrepareContext(context.Context, string) (*sql.Stmt, error) + QueryContext(context.Context, string, ...any) (*sql.Rows, error) + QueryRowContext(context.Context, string, ...any) *sql.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx *sql.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/endtoend/testdata/duckdb_struct_field/duckdb/go/models.go b/internal/endtoend/testdata/duckdb_struct_field/duckdb/go/models.go new file mode 100644 index 0000000000..93757b84e3 --- /dev/null +++ b/internal/endtoend/testdata/duckdb_struct_field/duckdb/go/models.go @@ -0,0 +1,10 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.31.1 + +package querytest + +type Item struct { + ID int32 + Info *map[string]any +} diff --git a/internal/endtoend/testdata/duckdb_struct_field/duckdb/go/query.sql.go b/internal/endtoend/testdata/duckdb_struct_field/duckdb/go/query.sql.go new file mode 100644 index 0000000000..8fe4d4c31c --- /dev/null +++ b/internal/endtoend/testdata/duckdb_struct_field/duckdb/go/query.sql.go @@ -0,0 +1,124 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.31.1 +// source: query.sql + +package querytest + +import ( + "context" + "database/sql" +) + +const bare = `-- name: Bare :many +SELECT info.label FROM items; +` + +func (q *Queries) Bare(ctx context.Context) ([]sql.NullString, error) { + rows, err := q.db.QueryContext(ctx, bare) + if err != nil { + return nil, err + } + defer rows.Close() + var items []sql.NullString + for rows.Next() { + var label sql.NullString + if err := rows.Scan(&label); err != nil { + return nil, err + } + items = append(items, label) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const caseInsensitive = `-- name: CaseInsensitive :many +SELECT info.LABEL AS label FROM items; +` + +func (q *Queries) CaseInsensitive(ctx context.Context) ([]sql.NullString, error) { + rows, err := q.db.QueryContext(ctx, caseInsensitive) + if err != nil { + return nil, err + } + defer rows.Close() + var items []sql.NullString + for rows.Next() { + var label sql.NullString + if err := rows.Scan(&label); err != nil { + return nil, err + } + items = append(items, label) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const filtered = `-- name: Filtered :many +SELECT id FROM items AS i WHERE i.info.score > $1; +` + +func (q *Queries) Filtered(ctx context.Context, dollar_1 sql.NullFloat64) ([]int32, error) { + rows, err := q.db.QueryContext(ctx, filtered, dollar_1) + if err != nil { + return nil, err + } + defer rows.Close() + var items []int32 + for rows.Next() { + var id int32 + if err := rows.Scan(&id); err != nil { + return nil, err + } + items = append(items, id) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const qualified = `-- name: Qualified :many +SELECT i.info.label AS label, i.info.score AS score FROM items AS i; +` + +type QualifiedRow struct { + Label sql.NullString + Score sql.NullFloat64 +} + +func (q *Queries) Qualified(ctx context.Context) ([]QualifiedRow, error) { + rows, err := q.db.QueryContext(ctx, qualified) + if err != nil { + return nil, err + } + defer rows.Close() + var items []QualifiedRow + for rows.Next() { + var i QualifiedRow + if err := rows.Scan(&i.Label, &i.Score); err != nil { + return nil, err + } + items = append(items, i) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/internal/endtoend/testdata/duckdb_struct_field/duckdb/query.sql b/internal/endtoend/testdata/duckdb_struct_field/duckdb/query.sql new file mode 100644 index 0000000000..bd339bd902 --- /dev/null +++ b/internal/endtoend/testdata/duckdb_struct_field/duckdb/query.sql @@ -0,0 +1,11 @@ +-- name: Bare :many +SELECT info.label FROM items; + +-- name: Qualified :many +SELECT i.info.label AS label, i.info.score AS score FROM items AS i; + +-- name: Filtered :many +SELECT id FROM items AS i WHERE i.info.score > $1; + +-- name: CaseInsensitive :many +SELECT info.LABEL AS label FROM items; diff --git a/internal/endtoend/testdata/duckdb_struct_field/duckdb/schema.sql b/internal/endtoend/testdata/duckdb_struct_field/duckdb/schema.sql new file mode 100644 index 0000000000..3e9d44d697 --- /dev/null +++ b/internal/endtoend/testdata/duckdb_struct_field/duckdb/schema.sql @@ -0,0 +1,4 @@ +CREATE TABLE items ( + id INTEGER NOT NULL, + info STRUCT(label VARCHAR, score DOUBLE, tags VARCHAR[]) +); diff --git a/internal/endtoend/testdata/duckdb_struct_field/duckdb/sqlc.yaml b/internal/endtoend/testdata/duckdb_struct_field/duckdb/sqlc.yaml new file mode 100644 index 0000000000..07d6d9d3b8 --- /dev/null +++ b/internal/endtoend/testdata/duckdb_struct_field/duckdb/sqlc.yaml @@ -0,0 +1,10 @@ +version: "2" +sql: + - engine: "duckdb" + schema: "schema.sql" + queries: "query.sql" + gen: + go: + package: "querytest" + out: "go" + sql_package: "database/sql"