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

schema/field: correctly extract package names from type identifier (#2765)

Browse Source 
Fixes https://github.com/ent/ent/issues/2761
This commit is contained in:
Ariel Mashraki
2022-07-17 16:49:11 +03:00
committed by GitHub
parent 01f97334af
commit ddc46d34d8
21 changed files with 438 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
schema/field/field.go
View File

@@ -12,6 +12,7 @@ import (
"math"
"reflect"
"regexp"
"strings"
"time"
"entgo.io/ent/schema"
@@ -1166,6 +1167,7 @@ func (d *Descriptor) goType(typ interface{}, expectType reflect.Type) {
Type: d.Info.Type,
Ident: t.String(),
PkgPath: tv.PkgPath(),
PkgName: pkgName(tv.String()),
RType: &RType{
rtype: t,
Kind: t.Kind(),
@@ -1189,6 +1191,20 @@ func (d *Descriptor) goType(typ interface{}, expectType reflect.Type) {
d.Info = info
}
// pkgName returns the package name from a Go
// identifier with a package qualifier.
func pkgName(ident string) string {
i := strings.LastIndexByte(ident, '.')
if i == -1 {
return ""
}
s := ident[:i]
if i := strings.LastIndexAny(s, "]*"); i != -1 {
s = s[i+1:]
}
return s
}
func methods(t reflect.Type, rtype *RType) {
// For type T, add methods with
// pointer receiver as well (*T).

11
schema/field/field_test.go
View File

@@ -378,6 +378,7 @@ func TestString(t *testing.T) {
assert.Equal(t, "*field_test.tURL", fd.Info.String())
assert.True(t, fd.Info.ValueScanner())
assert.True(t, fd.Info.Stringer())
assert.Equal(t, "field_test", fd.Info.PkgName)
fd = field.String("name").GoType(1).Descriptor()
assert.Error(t, fd.Err)
@@ -426,6 +427,7 @@ func TestTime(t *testing.T) {
assert.Equal(t, "*sql.NullTime", fd.Info.String())
assert.True(t, fd.Info.Nillable)
assert.True(t, fd.Info.ValueScanner())
assert.Equal(t, "sql", fd.Info.PkgName)
fd = field.Time("deleted_at").GoType(Time{}).Default(time.Now).Descriptor()
assert.Error(t, fd.Err)
@@ -450,6 +452,7 @@ func TestJSON(t *testing.T) {
assert.Equal(t, "comment", fd.Comment)
assert.True(t, fd.Info.Nillable)
assert.False(t, fd.Info.RType.IsPtr())
assert.Empty(t, fd.Info.PkgName)
type T struct{ S string }
fd = field.JSON("name", &T{}).
@@ -489,12 +492,15 @@ func TestJSON(t *testing.T) {
Default([]http.Dir{"a", "b"}).
Descriptor()
assert.NoError(t, fd.Err)
assert.Equal(t, "http", fd.Info.PkgName)
fd = field.JSON("dirs", []http.Dir{}).
Default(func() []http.Dir {
return []http.Dir{"/tmp"}
}).
Descriptor()
assert.NoError(t, fd.Err)
fd = field.JSON("dirs", []http.Dir{}).
Default([]string{"a", "b"}).
Descriptor()
@@ -502,14 +508,19 @@ func TestJSON(t *testing.T) {
fd = field.JSON("values", &url.Values{}).Descriptor()
assert.Equal(t, "net/url", fd.Info.PkgPath)
assert.Equal(t, "url", fd.Info.PkgName)
fd = field.JSON("values", []url.Values{}).Descriptor()
assert.Equal(t, "net/url", fd.Info.PkgPath)
assert.Equal(t, "url", fd.Info.PkgName)
fd = field.JSON("values", []*url.Values{}).Descriptor()
assert.Equal(t, "net/url", fd.Info.PkgPath)
assert.Equal(t, "url", fd.Info.PkgName)
fd = field.JSON("values", map[string]url.Values{}).Descriptor()
assert.Equal(t, "net/url", fd.Info.PkgPath)
assert.Equal(t, "url", fd.Info.PkgName)
fd = field.JSON("values", map[string]*url.Values{}).Descriptor()
assert.Equal(t, "net/url", fd.Info.PkgPath)
assert.Equal(t, "url", fd.Info.PkgName)
fd = field.JSON("addr", net.Addr(nil)).Descriptor()
assert.EqualError(t, fd.Err, "expect a Go value as JSON type, but got nil")
}