diff --git a/internal/compiler/output_columns.go b/internal/compiler/output_columns.go index badec377b2..38c7b02be3 100644 --- a/internal/compiler/output_columns.go +++ b/internal/compiler/output_columns.go @@ -140,6 +140,7 @@ func outputColumns(qc *QueryCatalog, node ast.Node) ([]*Column, error) { for _, c := range columns { found = true c.NotNull = true + c.skipTableRequiredCheck = true cols = append(cols, c) } } @@ -245,7 +246,7 @@ func outputColumns(qc *QueryCatalog, node ast.Node) ([]*Column, error) { if n, ok := node.(*ast.SelectStmt); ok { for _, col := range cols { - if !col.NotNull || col.Table == nil { + if !col.NotNull || col.Table == nil || col.skipTableRequiredCheck { continue } for _, f := range n.FromClause.Items { diff --git a/internal/compiler/query.go b/internal/compiler/query.go index 6fc3513b7c..c9ef620733 100644 --- a/internal/compiler/query.go +++ b/internal/compiler/query.go @@ -26,6 +26,8 @@ type Column struct { Scope string Table *ast.TableName Type *ast.TypeName + + skipTableRequiredCheck bool } type Query struct { diff --git a/internal/endtoend/testdata/coalesce_join/postgresql/go/db.go b/internal/endtoend/testdata/coalesce_join/postgresql/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/coalesce_join/postgresql/go/db.go @@ -0,0 +1,29 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "context" + "database/sql" +) + +type DBTX interface { + ExecContext(context.Context, string, ...interface{}) (sql.Result, error) + PrepareContext(context.Context, string) (*sql.Stmt, error) + QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error) + QueryRowContext(context.Context, string, ...interface{}) *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/coalesce_join/postgresql/go/models.go b/internal/endtoend/testdata/coalesce_join/postgresql/go/models.go new file mode 100644 index 0000000000..45a4ee4f1b --- /dev/null +++ b/internal/endtoend/testdata/coalesce_join/postgresql/go/models.go @@ -0,0 +1,13 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import () + +type Bar struct { + ID int64 +} + +type Foo struct { + ID int64 +} diff --git a/internal/endtoend/testdata/coalesce_join/postgresql/go/query.sql.go b/internal/endtoend/testdata/coalesce_join/postgresql/go/query.sql.go new file mode 100644 index 0000000000..584d6ad6ac --- /dev/null +++ b/internal/endtoend/testdata/coalesce_join/postgresql/go/query.sql.go @@ -0,0 +1,42 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" +) + +const getBar = `-- name: GetBar :many +SELECT foo.id, COALESCE(bar.id, 0) AS bar_id +FROM foo +LEFT JOIN bar ON foo.id = bar.id +` + +type GetBarRow struct { + ID int64 + BarID int64 +} + +func (q *Queries) GetBar(ctx context.Context) ([]GetBarRow, error) { + rows, err := q.db.QueryContext(ctx, getBar) + if err != nil { + return nil, err + } + defer rows.Close() + var items []GetBarRow + for rows.Next() { + var i GetBarRow + if err := rows.Scan(&i.ID, &i.BarID); 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/coalesce_join/postgresql/query.sql b/internal/endtoend/testdata/coalesce_join/postgresql/query.sql new file mode 100644 index 0000000000..f2b6bfa352 --- /dev/null +++ b/internal/endtoend/testdata/coalesce_join/postgresql/query.sql @@ -0,0 +1,7 @@ +CREATE TABLE foo(id bigserial primary key); +CREATE TABLE bar(id bigserial primary key); + +-- name: GetBar :many +SELECT foo.*, COALESCE(bar.id, 0) AS bar_id +FROM foo +LEFT JOIN bar ON foo.id = bar.id; diff --git a/internal/endtoend/testdata/coalesce_join/postgresql/sqlc.json b/internal/endtoend/testdata/coalesce_join/postgresql/sqlc.json new file mode 100644 index 0000000000..c72b6132d5 --- /dev/null +++ b/internal/endtoend/testdata/coalesce_join/postgresql/sqlc.json @@ -0,0 +1,12 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "postgresql", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +}