golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-04-28 05:30:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

entc/load: merge annotations from the same type

Browse Source
This commit is contained in:
Ariel Mashraki
2020-12-13 18:43:38 +02:00
committed by Ariel Mashraki
parent ad01a0aadb
commit be9955a860
10 changed files with 77 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dialect/entsql/annotation.go
View File

@@ -58,7 +58,7 @@ func (Annotation) Name() string {
}
// Merge implements the schema.Merger interface.
func (a *Annotation) Merge(other schema.Annotation) {
func (a Annotation) Merge(other schema.Annotation) schema.Annotation {
var ant Annotation
switch other := other.(type) {
case Annotation:
@@ -68,7 +68,7 @@ func (a *Annotation) Merge(other schema.Annotation) {
ant = *other
}
default:
return
return a
}
if t := ant.Table; t != "" {
a.Table = t
@@ -85,6 +85,7 @@ func (a *Annotation) Merge(other schema.Annotation) {
if s := ant.Size; s != 0 {
a.Size = s
}
return a
}
var (