Skip to content

Improve nullability evaluation #2858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lorenz wants to merge 1 commit into from
Closed

Improve nullability evaluation #2858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion internal/codegen/golang/result.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,11 @@ func columnsToStruct(req *plugin.CodeGenRequest, options *opts, name string, col
if c.embed == nil {
f.Type = goType(req, options, c.Column)
} else {
f.Type = c.embed.modelType
if c.NotNull {
f.Type = c.embed.modelType
} else {
return nil, fmt.Errorf("embedded macro for %q is nullable, this is currently unsupported", c.embed.modelName)
}
f.EmbedFields = c.embed.fields
}

Expand Down
27 changes: 24 additions & 3 deletions internal/compiler/output_columns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,10 @@ func (c *Compiler) outputColumns(qc *QueryCatalog, node ast.Node) ([]*Column, er
cols = append(cols, &Column{
Name: embed.Table.Name,
EmbedTable: embed.Table,
// In general, embeds should not be nullable.
// If joins require them to be, this will be overriden
// later on.
NotNull: true,
})
continue
}
Expand Down Expand Up @@ -399,7 +403,7 @@ func (c *Compiler) outputColumns(qc *QueryCatalog, node ast.Node) ([]*Column, er

if n, ok := node.(*ast.SelectStmt); ok {
for _, col := range cols {
if !col.NotNull || col.Table == nil || col.skipTableRequiredCheck {
if !col.NotNull || col.skipTableRequiredCheck {
continue
}
for _, f := range n.FromClause.Items {
Expand All @@ -423,10 +427,27 @@ const (
func isTableRequired(n ast.Node, col *Column, prior int) int {
switch n := n.(type) {
case *ast.RangeVar:
if n.Alias == nil && *n.Relname == col.Table.Name {
var tblName string
if col.Table != nil {
tblName = col.Table.Name
} else if col.EmbedTable != nil {
tblName = col.EmbedTable.Name
}
if tblName == "" {
return tableNotFound
}
if n.Alias == nil && *n.Relname == tblName {
return prior
}
if n.Alias != nil && *n.Alias.Aliasname == col.TableAlias && *n.Relname == tblName {
return prior
}
case *ast.RangeSubselect:
if n.Alias != nil && n.Alias.Aliasname != nil && *n.Alias.Aliasname == col.TableAlias {
return prior
}
if n.Alias != nil && *n.Alias.Aliasname == col.TableAlias && *n.Relname == col.Table.Name {
case *ast.RangeFunction:
if n.Alias != nil && n.Alias.Aliasname != nil && *n.Alias.Aliasname == col.TableAlias {
return prior
}
case *ast.JoinExpr:
Expand Down