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

entc/gen: remove legacy i2a support for ids (#389)

Browse Source 
* entc/gen: remove legacy i2a support for ids

* integ: add customid tests for fk strings
This commit is contained in:
Ariel Mashraki
2020-03-16 18:19:30 +02:00
committed by GitHub
parent 15cbc5c223
commit 65f96b3593
110 changed files with 1911 additions and 1900 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
entc/gen/template/dialect/sql/query.tmpl
View File

@@ -175,7 +175,7 @@ func ({{ $receiver }} *{{ $builder }}) sqlQuery() *sql.Selector {
{{- $n := $ }} {{/* the node we start the query from. */}}
{{- $e := $.Scope.Edge }} {{/* the edge we need to genegrate the path to. */}}
{{- $receiver := $.Scope.Receiver -}}
id := {{ $receiver }}.{{ if and $.ID.IsString (not $.ID.UserDefined) }}id(){{ else }}ID{{ end }}
id := {{ $receiver }}.ID
step := sqlgraph.NewStep(
sqlgraph.From({{ $n.Package }}.Table, {{ $n.Package }}.{{ $n.ID.Constant }}, id),
sqlgraph.To({{ $e.Type.Package }}.Table, {{ $e.Type.Package }}.{{ $e.Type.ID.Constant }}),
@@ -283,16 +283,7 @@ func ({{ $receiver }} *{{ $builder }}) sqlQuery() *sql.Selector {
fks := make([]driver.Value, 0, len(nodes))
nodeids := make(map[{{ $.ID.Type }}]*{{ $.Name }})
for i := range nodes {
{{- /* Convert string-ids that are stored as int in the database */ -}}
{{- if and (not $.ID.UserDefined) $.ID.IsString }}
id, err := strconv.Atoi(nodes[i].ID)
if err != nil {
return nil, err
}
fks = append(fks, id)
{{- else }}
fks = append(fks, nodes[i].ID)
{{- end }}
fks = append(fks, nodes[i].ID)
nodeids[nodes[i].ID] = nodes[i]
}
query.withFKs = true
@@ -318,14 +309,11 @@ func ({{ $receiver }} *{{ $builder }}) sqlQuery() *sql.Selector {
}
{{ end }}
{{- /* Convert string-ids that are stored as int in the database */ -}}
{{ define "dialect/sql/query/eagerloading/m2massign" }}
{{- $arg := $.Scope.Arg }}
{{- $field := $.Scope.Field }}
{{- $nulltype := $.Scope.NullType }}
{{- if and (not $field.UserDefined) $field.IsString -}}
strconv.FormatInt({{ $arg }}.Int64, 10)
{{- else if hasPrefix $nulltype "sql" -}}
{{- if hasPrefix $nulltype "sql" -}}
{{ $field.NullTypeField $arg -}}
{{- else -}}
{{ if not $field.Nillable }}*{{ end }}{{ $arg }}