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: correctly handle custom storage-key for id fields (#643)

Browse Source 
Fixed #621
This commit is contained in:
Ariel Mashraki
2020-07-28 10:14:21 +03:00
committed by GitHub
parent 5f16308551
commit dd3cdc147d
21 changed files with 71 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
entc/gen/template/dialect/sql/predicate.tmpl
View File

@@ -59,10 +59,11 @@ in the LICENSE file in the root directory of this source tree.
{{ define "dialect/sql/predicate/edge/has" -}}
{{- $e := $.Scope.Edge -}}
{{- $refid := $.ID.Constant }}{{ if ne $e.Type.ID.StorageKey $.ID.StorageKey }}{{ $refid = print $e.Type.Name "FieldID" }}{{ end -}}
func(s *sql.Selector) {
step := sqlgraph.NewStep(
sqlgraph.From(Table, {{ $.ID.Constant }}),
sqlgraph.To({{ $e.TableConstant }}, {{ $.ID.Constant }}),
sqlgraph.To({{ $e.TableConstant }}, {{ $refid }}),
sqlgraph.Edge(sqlgraph.{{ $e.Rel.Type }}, {{ $e.IsInverse }}, {{ $e.TableConstant }},
{{- if $e.M2M -}}
{{ $e.PKConstant }}...
@@ -77,10 +78,11 @@ in the LICENSE file in the root directory of this source tree.
{{ define "dialect/sql/predicate/edge/haswith" -}}
{{- $e := $.Scope.Edge -}}
{{- $refid := $.ID.Constant }}{{ if ne $e.Type.ID.StorageKey $.ID.StorageKey }}{{ $refid = print $e.Type.Name "FieldID" }}{{ end -}}
func(s *sql.Selector) {
step := sqlgraph.NewStep(
sqlgraph.From(Table, {{ $.ID.Constant }}),
sqlgraph.To({{ if ne $.Table $e.Type.Table }}{{ $e.InverseTableConstant }}{{ else }}Table{{ end }}, {{ $.ID.Constant }}),
sqlgraph.To({{ if ne $.Table $e.Type.Table }}{{ $e.InverseTableConstant }}{{ else }}Table{{ end }}, {{ $refid }}),
sqlgraph.Edge(sqlgraph.{{ $e.Rel.Type }}, {{ $e.IsInverse }}, {{ $e.TableConstant }},
{{- if $e.M2M -}}
{{ $e.PKConstant }}...