From ba9bd163276b1c4f2f99dc71d9adc363e8d44ca8 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Sat, 9 Oct 2021 16:42:51 -0500 Subject: [PATCH 1/2] fix(compiler): Mark nullable when casting NULL --- internal/compiler/output_columns.go | 9 +++- .../endtoend/testdata/cast_null/pgx/go/db.go | 30 +++++++++++ .../testdata/cast_null/pgx/go/models.go | 11 ++++ .../testdata/cast_null/pgx/go/query.sql.go | 33 ++++++++++++ .../endtoend/testdata/cast_null/pgx/query.sql | 5 ++ .../endtoend/testdata/cast_null/pgx/sqlc.json | 13 +++++ .../testdata/cast_null/stdlib/go/db.go | 29 ++++++++++ .../testdata/cast_null/stdlib/go/models.go | 11 ++++ .../testdata/cast_null/stdlib/go/query.sql.go | 53 +++++++++++++++++++ .../testdata/cast_null/stdlib/query.sql | 9 ++++ .../testdata/cast_null/stdlib/sqlc.json | 11 ++++ 11 files changed, 213 insertions(+), 1 deletion(-) create mode 100644 internal/endtoend/testdata/cast_null/pgx/go/db.go create mode 100644 internal/endtoend/testdata/cast_null/pgx/go/models.go create mode 100644 internal/endtoend/testdata/cast_null/pgx/go/query.sql.go create mode 100644 internal/endtoend/testdata/cast_null/pgx/query.sql create mode 100644 internal/endtoend/testdata/cast_null/pgx/sqlc.json create mode 100644 internal/endtoend/testdata/cast_null/stdlib/go/db.go create mode 100644 internal/endtoend/testdata/cast_null/stdlib/go/models.go create mode 100644 internal/endtoend/testdata/cast_null/stdlib/go/query.sql.go create mode 100644 internal/endtoend/testdata/cast_null/stdlib/query.sql create mode 100644 internal/endtoend/testdata/cast_null/stdlib/sqlc.json diff --git a/internal/compiler/output_columns.go b/internal/compiler/output_columns.go index 7e0d57abb5..2a38b90db9 100644 --- a/internal/compiler/output_columns.go +++ b/internal/compiler/output_columns.go @@ -106,7 +106,8 @@ func outputColumns(qc *QueryCatalog, node ast.Node) ([]*Column, error) { if res.Name != nil { name = *res.Name } - // TODO: The TypeCase code has been copied from below. Instead, we need a recurse function to get the type of a node. + // TODO: The TypeCase code has been copied from below. Instead, we + // need a recurse function to get the type of a node. if tc, ok := n.Defresult.(*ast.TypeCast); ok { if tc.TypeName == nil { return nil, errors.New("no type name type cast") @@ -236,6 +237,12 @@ func outputColumns(qc *QueryCatalog, node ast.Node) ([]*Column, error) { // TODO Validate column names col := toColumn(n.TypeName) col.Name = name + // TODO Add correct, real type inference + if constant, ok := n.Arg.(*ast.A_Const); ok { + if _, ok := constant.Val.(*ast.Null); ok { + col.NotNull = false + } + } cols = append(cols, col) default: diff --git a/internal/endtoend/testdata/cast_null/pgx/go/db.go b/internal/endtoend/testdata/cast_null/pgx/go/db.go new file mode 100644 index 0000000000..4559f50a4f --- /dev/null +++ b/internal/endtoend/testdata/cast_null/pgx/go/db.go @@ -0,0 +1,30 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "context" + + "github.com/jackc/pgconn" + "github.com/jackc/pgx/v4" +) + +type DBTX interface { + Exec(context.Context, string, ...interface{}) (pgconn.CommandTag, error) + Query(context.Context, string, ...interface{}) (pgx.Rows, error) + QueryRow(context.Context, string, ...interface{}) pgx.Row +} + +func New(db DBTX) *Queries { + return &Queries{db: db} +} + +type Queries struct { + db DBTX +} + +func (q *Queries) WithTx(tx pgx.Tx) *Queries { + return &Queries{ + db: tx, + } +} diff --git a/internal/endtoend/testdata/cast_null/pgx/go/models.go b/internal/endtoend/testdata/cast_null/pgx/go/models.go new file mode 100644 index 0000000000..8170fc4b5c --- /dev/null +++ b/internal/endtoend/testdata/cast_null/pgx/go/models.go @@ -0,0 +1,11 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" +) + +type Foo struct { + Bar sql.NullString +} diff --git a/internal/endtoend/testdata/cast_null/pgx/go/query.sql.go b/internal/endtoend/testdata/cast_null/pgx/go/query.sql.go new file mode 100644 index 0000000000..bf745818d2 --- /dev/null +++ b/internal/endtoend/testdata/cast_null/pgx/go/query.sql.go @@ -0,0 +1,33 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" +) + +const castCoalesce = `-- name: CastCoalesce :many +SELECT coalesce(bar, '')::text as login +FROM foo +` + +func (q *Queries) CastCoalesce(ctx context.Context) ([]string, error) { + rows, err := q.db.Query(ctx, castCoalesce) + if err != nil { + return nil, err + } + defer rows.Close() + var items []string + for rows.Next() { + var login string + if err := rows.Scan(&login); err != nil { + return nil, err + } + items = append(items, login) + } + if err := rows.Err(); err != nil { + return nil, err + } + return items, nil +} diff --git a/internal/endtoend/testdata/cast_null/pgx/query.sql b/internal/endtoend/testdata/cast_null/pgx/query.sql new file mode 100644 index 0000000000..b3ca73e3ec --- /dev/null +++ b/internal/endtoend/testdata/cast_null/pgx/query.sql @@ -0,0 +1,5 @@ +CREATE TABLE foo (bar text); + +-- name: CastCoalesce :many +SELECT coalesce(bar, '')::text as login +FROM foo; diff --git a/internal/endtoend/testdata/cast_null/pgx/sqlc.json b/internal/endtoend/testdata/cast_null/pgx/sqlc.json new file mode 100644 index 0000000000..9403bd0279 --- /dev/null +++ b/internal/endtoend/testdata/cast_null/pgx/sqlc.json @@ -0,0 +1,13 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "engine": "postgresql", + "sql_package": "pgx/v4", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} diff --git a/internal/endtoend/testdata/cast_null/stdlib/go/db.go b/internal/endtoend/testdata/cast_null/stdlib/go/db.go new file mode 100644 index 0000000000..6a99519302 --- /dev/null +++ b/internal/endtoend/testdata/cast_null/stdlib/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/cast_null/stdlib/go/models.go b/internal/endtoend/testdata/cast_null/stdlib/go/models.go new file mode 100644 index 0000000000..8170fc4b5c --- /dev/null +++ b/internal/endtoend/testdata/cast_null/stdlib/go/models.go @@ -0,0 +1,11 @@ +// Code generated by sqlc. DO NOT EDIT. + +package querytest + +import ( + "database/sql" +) + +type Foo struct { + Bar sql.NullString +} diff --git a/internal/endtoend/testdata/cast_null/stdlib/go/query.sql.go b/internal/endtoend/testdata/cast_null/stdlib/go/query.sql.go new file mode 100644 index 0000000000..73969b570f --- /dev/null +++ b/internal/endtoend/testdata/cast_null/stdlib/go/query.sql.go @@ -0,0 +1,53 @@ +// Code generated by sqlc. DO NOT EDIT. +// source: query.sql + +package querytest + +import ( + "context" + "database/sql" +) + +const listNullable = `-- name: ListNullable :many +SELECT + NULL::text as a, + NULL::integer as b, + NULL::bigint as c, + NULL::time as d +FROM foo +` + +type ListNullableRow struct { + A sql.NullString + B sql.NullInt32 + C sql.NullInt64 + D sql.NullTime +} + +func (q *Queries) ListNullable(ctx context.Context) ([]ListNullableRow, error) { + rows, err := q.db.QueryContext(ctx, listNullable) + if err != nil { + return nil, err + } + defer rows.Close() + var items []ListNullableRow + for rows.Next() { + var i ListNullableRow + if err := rows.Scan( + &i.A, + &i.B, + &i.C, + &i.D, + ); 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/cast_null/stdlib/query.sql b/internal/endtoend/testdata/cast_null/stdlib/query.sql new file mode 100644 index 0000000000..b2a7a6ed81 --- /dev/null +++ b/internal/endtoend/testdata/cast_null/stdlib/query.sql @@ -0,0 +1,9 @@ +CREATE TABLE foo (bar text); + +-- name: ListNullable :many +SELECT + NULL::text as a, + NULL::integer as b, + NULL::bigint as c, + NULL::time as d +FROM foo; diff --git a/internal/endtoend/testdata/cast_null/stdlib/sqlc.json b/internal/endtoend/testdata/cast_null/stdlib/sqlc.json new file mode 100644 index 0000000000..ac7c2ed829 --- /dev/null +++ b/internal/endtoend/testdata/cast_null/stdlib/sqlc.json @@ -0,0 +1,11 @@ +{ + "version": "1", + "packages": [ + { + "path": "go", + "name": "querytest", + "schema": "query.sql", + "queries": "query.sql" + } + ] +} From 2b706b0e43dc251dc10eb6390f21ad6b9a8ff8a5 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Sat, 9 Oct 2021 16:46:25 -0500 Subject: [PATCH 2/2] Update pgx tests --- .../testdata/cast_null/pgx/go/query.sql.go | 33 ++++++++++++++----- .../endtoend/testdata/cast_null/pgx/query.sql | 8 +++-- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/internal/endtoend/testdata/cast_null/pgx/go/query.sql.go b/internal/endtoend/testdata/cast_null/pgx/go/query.sql.go index bf745818d2..abe11ff3da 100644 --- a/internal/endtoend/testdata/cast_null/pgx/go/query.sql.go +++ b/internal/endtoend/testdata/cast_null/pgx/go/query.sql.go @@ -5,26 +5,43 @@ package querytest import ( "context" + "database/sql" ) -const castCoalesce = `-- name: CastCoalesce :many -SELECT coalesce(bar, '')::text as login +const listNullable = `-- name: ListNullable :many +SELECT + NULL::text as a, + NULL::integer as b, + NULL::bigint as c, + NULL::time as d FROM foo ` -func (q *Queries) CastCoalesce(ctx context.Context) ([]string, error) { - rows, err := q.db.Query(ctx, castCoalesce) +type ListNullableRow struct { + A sql.NullString + B sql.NullInt32 + C sql.NullInt64 + D sql.NullTime +} + +func (q *Queries) ListNullable(ctx context.Context) ([]ListNullableRow, error) { + rows, err := q.db.Query(ctx, listNullable) if err != nil { return nil, err } defer rows.Close() - var items []string + var items []ListNullableRow for rows.Next() { - var login string - if err := rows.Scan(&login); err != nil { + var i ListNullableRow + if err := rows.Scan( + &i.A, + &i.B, + &i.C, + &i.D, + ); err != nil { return nil, err } - items = append(items, login) + items = append(items, i) } if err := rows.Err(); err != nil { return nil, err diff --git a/internal/endtoend/testdata/cast_null/pgx/query.sql b/internal/endtoend/testdata/cast_null/pgx/query.sql index b3ca73e3ec..b2a7a6ed81 100644 --- a/internal/endtoend/testdata/cast_null/pgx/query.sql +++ b/internal/endtoend/testdata/cast_null/pgx/query.sql @@ -1,5 +1,9 @@ CREATE TABLE foo (bar text); --- name: CastCoalesce :many -SELECT coalesce(bar, '')::text as login +-- name: ListNullable :many +SELECT + NULL::text as a, + NULL::integer as b, + NULL::bigint as c, + NULL::time as d FROM foo;