schema/field: correctly extract package names from type identifier (e…

…nt#2765) Fixes ent#2761
leenux · Jul 17, 2022 · ddc46d3 · ddc46d3
1 parent 01f9733
commit ddc46d3
Show file tree

Hide file tree

Showing 21 changed files with 438 additions and 15 deletions.
diff --git a/entc/gen/template/import.tmpl b/entc/gen/template/import.tmpl
@@ -42,7 +42,7 @@ import (
 	{{- range $f := $fields }}
 		{{- $pkg := $f.Type.PkgPath }}
 		{{- if and $pkg (not (hasImport (base $pkg ))) }}
-			{{- $name := trim (index (split $f.Type.RType.Ident ".") 0) "[]*" }}
+			{{- $name := $f.Type.PkgName }}
 			{{ if ne $name (base $pkg) }}{{ $name }} {{ end}}"{{ $pkg }}"
 		{{- end }}
 	{{- end }}

diff --git a/entc/integration/edgeschema/ent/internal/schema.go b/entc/integration/edgeschema/ent/internal/schema.go
diff --git a/entc/integration/ent/entql.go b/entc/integration/ent/entql.go
diff --git a/entc/integration/ent/migrate/schema.go b/entc/integration/ent/migrate/schema.go
diff --git a/entc/integration/ent/mutation.go b/entc/integration/ent/mutation.go
diff --git a/entc/integration/ent/schema/task.go b/entc/integration/ent/schema/task.go
@@ -25,5 +25,7 @@ func (Task) Fields() []ent.Field {
 			Validate(func(i int) error {
 				return task.Priority(i).Validate()
 			}),
+		field.JSON("priorities", map[string]task.Priority{}).
+			Optional(),
 	}
 }
diff --git a/entc/integration/ent/task.go b/entc/integration/ent/task.go
diff --git a/entc/integration/ent/task/task.go b/entc/integration/ent/task/task.go
diff --git a/entc/integration/ent/task/where.go b/entc/integration/ent/task/where.go
diff --git a/entc/integration/ent/task_create.go b/entc/integration/ent/task_create.go