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..abe11ff3da --- /dev/null +++ b/internal/endtoend/testdata/cast_null/pgx/go/query.sql.go @@ -0,0 +1,50 @@ +// 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.Query(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.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..b2a7a6ed81 --- /dev/null +++ b/internal/endtoend/testdata/cast_null/pgx/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/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" + } + ] +}