Thanks to visit codestin.com
Credit goes to Github.com

Skip to content

entc/gen: fix nil pointer dereference with multiple entsql.Skip() annotations #4456

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

Open
kb-y-nakano wants to merge 1 commit into
base: master
Choose a base branch
from
Open

entc/gen: fix nil pointer dereference with multiple entsql.Skip() annotations #4456

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
16 changes: 16 additions & 0 deletions entc/gen/graph.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,6 +669,10 @@ func (g *Graph) Tables() (all []*schema.Table, err error) {
}
}
for _, n := range g.Nodes {
// Skip edge processing for schemas marked with Skip annotation.
if ant := n.EntSQL(); ant != nil && ant.Skip {
continue
}
// Foreign key and its reference, or a join table.
for _, e := range n.Edges {
if e.IsInverse() {
Expand All @@ -679,6 +683,10 @@ func (g *Graph) Tables() (all []*schema.Table, err error) {
// The "owner" is the table that owns the relation (we set
// the foreign-key on) and "ref" is the referenced table.
owner, ref := tables[e.Rel.Table], tables[n.Table()]
// Skip if either table is nil (e.g., skipped from migration).
if owner == nil || ref == nil {
continue
}
column := fkColumn(e, owner, ref.PrimaryKey[0])
// If it's not a circular reference (self-referencing table),
// and the inverse edge is required, make it non-nullable.
Expand All @@ -695,6 +703,10 @@ func (g *Graph) Tables() (all []*schema.Table, err error) {
})
case M2O:
ref, owner := tables[e.Type.Table()], tables[e.Rel.Table]
// Skip if either table is nil (e.g., skipped from migration).
if ref == nil || owner == nil {
continue
}
column := fkColumn(e, owner, ref.PrimaryKey[0])
// If it's not a circular reference (self-referencing table),
// and the edge is non-optional (required), make it non-nullable.
Expand All @@ -715,6 +727,10 @@ func (g *Graph) Tables() (all []*schema.Table, err error) {
continue
}
t1, t2 := tables[n.Table()], tables[e.Type.Table()]
// Skip if either table is nil (e.g., skipped from migration).
if t1 == nil || t2 == nil {
continue
}
c1 := &schema.Column{Name: e.Rel.Columns[0], Type: field.TypeInt, SchemaType: n.ID.def.SchemaType}
if ref := n.ID; ref.UserDefined {
c1.Type = ref.Type.Type
Expand Down