From 1b697f66f4c1df142c63dfcd4256282e7567c124 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): name an unnamed result column by position targetName returned "?column?" for a result column with no alias that is not a column reference or a function call. The Go generator uses a non-empty name as written, so it emitted "var ?column? ..." and sqlc generate failed with "illegal character U+003F". Return an empty name. The generator already falls back to column_N for an empty name, which is what the PostgreSQL and SQLite engines produce. Adds the duckdb_unnamed_columns end-to-end case. --- internal/core/analyzer/projection.go | 5 +- .../duckdb_unnamed_columns/duckdb/exec.json | 1 + .../duckdb_unnamed_columns/duckdb/go/db.go | 31 ++++ .../duckdb/go/models.go | 15 ++ .../duckdb/go/query.sql.go | 136 ++++++++++++++++++ .../duckdb_unnamed_columns/duckdb/query.sql | 11 ++ .../duckdb_unnamed_columns/duckdb/schema.sql | 1 + .../duckdb_unnamed_columns/duckdb/sqlc.yaml | 10 ++ 8 files changed, 209 insertions(+), 1 deletion(-) create mode 100644 internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/exec.json create mode 100644 internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/go/db.go create mode 100644 internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/go/models.go create mode 100644 internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/go/query.sql.go create mode 100644 internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/query.sql create mode 100644 internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/schema.sql create mode 100644 internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/sqlc.yaml diff --git a/internal/core/analyzer/projection.go b/internal/core/analyzer/projection.go index 17fc3cbf47..b95b43139e 100644 --- a/internal/core/analyzer/projection.go +++ b/internal/core/analyzer/projection.go @@ -105,6 +105,9 @@ func (a *analyzer) decorateSource(col *core.Column, attOID int64, tableAlias str // targetName picks the output name for a target. fields is the already // flattened field list when rt.Val is a column reference, and nil otherwise. +// A target with no name returns "", so code generation names it by position +// (column_1) as it does for the other engines. "?column?" is not a valid +// identifier in the generated code. func targetName(rt *ast.ResTarget, fields []string) string { if rt.Name != nil && *rt.Name != "" { return *rt.Name @@ -117,7 +120,7 @@ func targetName(rt *ast.ResTarget, fields []string) string { return name } } - return "?column?" + return "" } func isStar(fields []string) bool { diff --git a/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/exec.json b/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/exec.json new file mode 100644 index 0000000000..f4e21983b6 --- /dev/null +++ b/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/exec.json @@ -0,0 +1 @@ +{"contexts": ["base"]} diff --git a/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/go/db.go b/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/go/db.go new file mode 100644 index 0000000000..32faa9f2b8 --- /dev/null +++ b/internal/endtoend/testdata/duckdb_unnamed_columns/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_unnamed_columns/duckdb/go/models.go b/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/go/models.go new file mode 100644 index 0000000000..b6328af7ae --- /dev/null +++ b/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/go/models.go @@ -0,0 +1,15 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.31.1 + +package querytest + +import ( + "database/sql" +) + +type Person struct { + ID int32 + Name string + Age sql.NullInt32 +} diff --git a/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/go/query.sql.go b/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/go/query.sql.go new file mode 100644 index 0000000000..5646173e42 --- /dev/null +++ b/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/go/query.sql.go @@ -0,0 +1,136 @@ +// Code generated by sqlc. DO NOT EDIT. +// versions: +// sqlc v1.31.1 +// source: query.sql + +package querytest + +import ( + "context" + "database/sql" +) + +const cast = `-- name: Cast :many +SELECT CAST(age AS BIGINT) FROM people; +` + +func (q *Queries) Cast(ctx context.Context) ([]sql.NullInt64, error) { + rows, err := q.db.QueryContext(ctx, cast) + if err != nil { + return nil, err + } + defer rows.Close() + var items []sql.NullInt64 + for rows.Next() { + var column_1 sql.NullInt64 + if err := rows.Scan(&column_1); err != nil { + return nil, err + } + items = append(items, column_1) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const concat = `-- name: Concat :many +SELECT name || '!' FROM people; +` + +func (q *Queries) Concat(ctx context.Context) ([]string, error) { + rows, err := q.db.QueryContext(ctx, concat) + if err != nil { + return nil, err + } + defer rows.Close() + var items []string + for rows.Next() { + var column_1 string + if err := rows.Scan(&column_1); err != nil { + return nil, err + } + items = append(items, column_1) + } + if err := rows.Close(); err != nil { + return nil, err + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} + +const mixed = `-- name: Mixed :many +SELECT id, upper(name), age + 1 AS next_age, id * 2 FROM people; +` + +type MixedRow struct { + ID int32 + Upper string + NextAge sql.NullInt32 + Column4 int32 +} + +func (q *Queries) Mixed(ctx context.Context) ([]MixedRow, error) { + rows, err := q.db.QueryContext(ctx, mixed) + if err != nil { + return nil, err + } + defer rows.Close() + var items []MixedRow + for rows.Next() { + var i MixedRow + if err := rows.Scan( + &i.ID, + &i.Upper, + &i.NextAge, + &i.Column4, + ); 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 +} + +const two = `-- name: Two :many +SELECT id + 1, age * 2 FROM people; +` + +type TwoRow struct { + Column1 int32 + Column2 sql.NullInt32 +} + +func (q *Queries) Two(ctx context.Context) ([]TwoRow, error) { + rows, err := q.db.QueryContext(ctx, two) + if err != nil { + return nil, err + } + defer rows.Close() + var items []TwoRow + for rows.Next() { + var i TwoRow + if err := rows.Scan(&i.Column1, &i.Column2); 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_unnamed_columns/duckdb/query.sql b/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/query.sql new file mode 100644 index 0000000000..c784ccba8b --- /dev/null +++ b/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/query.sql @@ -0,0 +1,11 @@ +-- name: Cast :many +SELECT CAST(age AS BIGINT) FROM people; + +-- name: Concat :many +SELECT name || '!' FROM people; + +-- name: Two :many +SELECT id + 1, age * 2 FROM people; + +-- name: Mixed :many +SELECT id, upper(name), age + 1 AS next_age, id * 2 FROM people; diff --git a/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/schema.sql b/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/schema.sql new file mode 100644 index 0000000000..050eae1044 --- /dev/null +++ b/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/schema.sql @@ -0,0 +1 @@ +CREATE TABLE people (id INTEGER NOT NULL, name VARCHAR NOT NULL, age INTEGER); diff --git a/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/sqlc.yaml b/internal/endtoend/testdata/duckdb_unnamed_columns/duckdb/sqlc.yaml new file mode 100644 index 0000000000..07d6d9d3b8 --- /dev/null +++ b/internal/endtoend/testdata/duckdb_unnamed_columns/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"