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: initial work for supporting uuid fields in codegen

Browse Source 
Summary: Pull Request resolved: https://github.com/facebookincubator/ent/pull/182

Reviewed By: alexsn

Differential Revision: D18638199

fbshipit-source-id: 0de79c78b51e544486c07a004c3c8ea82e5c3398
This commit is contained in:
Ariel Mashraki
2019-11-24 07:00:37 -08:00
committed by Facebook Github Bot
parent e6c6442c84
commit 67c3fd2db9
81 changed files with 1914 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
entc/gen/template/dialect/sql/create.tmpl
View File

@@ -37,11 +37,22 @@ func ({{ $receiver }} *{{ $builder }}) sqlSave(ctx context.Context) (*{{ $.Name
{{ $.Receiver }}.{{ $f.StructField }} = {{ if not $f.Nillable }}*{{ end }}value
}
{{- end }}
id, err := insertLastID(ctx, tx, insert.Returning({{ $.Package }}.{{ $.ID.Constant }}))
if err != nil {
return nil, rollback(tx, err)
}
{{ $.Receiver }}.ID = {{ if and $.ID.IsString (not $.ID.UserDefined) }}strconv.FormatInt(id, 10){{ else }}{{ $.ID.Type }}(id){{ end }}
{{/* if it's a non-numeric id defined by the user (does not have default value). */}}
{{- if and $.ID.UserDefined (or $.ID.IsString $.ID.IsUUID) }}
query, args := insert.Query()
if err := tx.Exec(ctx, query, args, new(sql.Result)); err != nil {
return nil, rollback(tx, err)
}
{{- if $.Edges }}
id := {{ $.Receiver }}.ID
{{- end }}
{{- else }}
id, err := insertLastID(ctx, tx, insert.Returning({{ $.Package }}.{{ $.ID.Constant }}))
if err != nil {
return nil, rollback(tx, err)
}
{{ $.Receiver }}.ID = {{ if and $.ID.IsString }}strconv.FormatInt(id, 10){{ else }}{{ $.ID.Type }}(id){{ end }}
{{- end }}
{{- range $_, $e := $.Edges }}
if len({{ $receiver }}.{{ $e.BuilderField }}) > 0 {
{{- if and $e.Unique $e.SelfRef }}{{/* O2O with self reference */}}
@@ -155,7 +166,8 @@ func ({{ $receiver }} *{{ $builder }}) sqlSave(ctx context.Context) (*{{ $.Name
{{ end }}
{{ define "dialect/sql/create/convertid" }}
{{- if $.Type.ID.IsString }}
{{- $id := $.Type.ID }}
{{- if and (not $id.UserDefined) $id.IsString }}
eid, err := strconv.Atoi(eid)
if err != nil {
return nil, rollback(tx, err)

43
entc/gen/template/dialect/sql/update.tmpl
View File

@@ -30,15 +30,22 @@ func ({{ $receiver }} *{{ $builder }}) sqlSave(ctx context.Context) ({{ $ret }}
return {{ $zero }}, err
}
defer rows.Close()
var ids []int
{{ $typ := "int" }}{{ if $.ID.UserDefined }}{{ $typ = $.ID.Type }}{{ end }}
var ids []{{ $typ }}
for rows.Next() {
var id int
var id {{ $typ }}
{{- if $one }}
{{ $.Receiver }} = &{{ $.Name }}{config: {{ $receiver }}.config}
if err := {{ $.Receiver }}.FromRows(rows); err != nil {
return {{ $zero }}, fmt.Errorf("{{ $pkg }}: failed scanning row into {{ $.Name }}: %v", err)
}
id = {{ if $.ID.IsString }}{{ $.Receiver }}.id(){{ else if not $.ID.IsInt }}int({{ $.Receiver }}.ID){{ else }}{{ $.Receiver }}.ID{{ end }}
{{- if and $.ID.IsString (not $.ID.UserDefined) }}
id = {{ $.Receiver }}.id()
{{- else if or $.ID.IsUUID $.ID.IsInt }}
id = {{ $.Receiver }}.ID
{{- else }}
id = int({{ $.Receiver }}.ID)
{{- end }}
{{- else }}
if err := rows.Scan(&id); err != nil {
return {{ $zero }}, fmt.Errorf("{{ $pkg }}: failed reading id: %v", err)
@@ -66,8 +73,17 @@ func ({{ $receiver }} *{{ $builder }}) sqlSave(ctx context.Context) ({{ $ret }}
{{- if $.Fields }}
var (
res sql.Result
updater = builder.Update({{ $.Package }}.Table).Where(sql.InInts({{ $.Package }}.{{ $.ID.Constant }}, ids...))
updater = builder.Update({{ $.Package }}.Table)
)
{{- if $.ID.IsInt }}
updater = updater.Where(sql.InInts({{ $.Package }}.{{ $.ID.Constant }}, ids...))
{{- else }}
idface := make([]interface{}, len(ids))
for i := range ids {
idface[i] = ids[i]
}
updater = updater.Where(sql.In({{ $.Package }}.{{ $.ID.Constant }}, idface...))
{{- end }}
{{- range $_, $f := $.Fields }}
{{- if or (not $f.Immutable) $f.UpdateDefault }}
if value := {{ $receiver }}.{{ $f.BuilderField }}; value != nil {
@@ -308,13 +324,16 @@ func ({{ $receiver }} *{{ $builder }}) sqlSave(ctx context.Context) ({{ $ret }}
{{ end }}
{{ define "dialect/sql/update/convertid" }}
{{- if $.Type.ID.IsString }}
eid, serr := strconv.Atoi(eid)
if serr != nil {
err = rollback(tx, serr)
return {{/* return is not knwon at this point. */}}
}
{{- else if not $.Type.ID.IsInt }}
eid := int(eid)
{{- $id := $.Type.ID }}
{{- if not $id.UserDefined }}
{{- if $id.IsString }}
eid, serr := strconv.Atoi(eid)
if serr != nil {
err = rollback(tx, serr)
return {{/* return is not knwon at this point. */}}
}
{{- else if not $id.IsInt}}
eid := int(eid)
{{- end }}
{{- end }}
{{ end }}