Skip to content

fix(template): avoid variable shadowing in generated TableType methods by prefixing underscore #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mackee merged 2 commits into from
May 19, 2025
Merged

fix(template): avoid variable shadowing in generated TableType methods by prefixing underscore #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d88990
fix(template): avoid variable shadowing in generated TableType method…
mackee May 19, 2025
5938bcc
chore(example): regenerate plugin codes for example
mackee May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions _example/postgresql/identities.plugin.gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 16 additions & 16 deletions _example/user.plugin.gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions template/plugins/slice.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ type {{ $sliceTypeName }} []*{{ $structName }}
{{- $methodName := pluralize $column.FieldName }}
func ({{ $receiver }} {{ $sliceTypeName }}) {{ $methodName }}() []{{ $column.TypeName }} {
vs := make([]{{ $column.TypeName }}, len({{ $receiver }}))
for i := range {{ $receiver }} {
vs[i] = {{ $receiver }}[i].{{ $column.FieldName }}
for _i := range {{ $receiver }} {
vs[_i] = {{ $receiver }}[_i].{{ $column.FieldName }}
}
return vs
}
Expand All @@ -25,11 +25,11 @@ func ({{ $receiver }} {{ $sliceTypeName }}) {{ $methodName }}() []{{ $column.Typ
{{- $column := $table.Lookup $columnName }}
{{- $fieldName := pluralize $column.FieldName }}
func ( {{ $receiver }} {{ $sliceTypeName }}) AssociateBy{{ $fieldName }}() map[{{ $column.TypeName }}]*{{ $structName }} {
m := make(map[{{ $column.TypeName }}]*{{ $structName }}, len({{ $receiver }}))
for _, v := range {{ $receiver }} {
m[v.{{ $column.FieldName }}] = v
_m := make(map[{{ $column.TypeName }}]*{{ $structName }}, len({{ $receiver }}))
for _, _v := range {{ $receiver }} {
_m[_v.{{ $column.FieldName }}] = _v
}
return m
return _m
}
{{ end }}
{{- end }}
Expand All @@ -40,11 +40,11 @@ func ( {{ $receiver }} {{ $sliceTypeName }}) AssociateBy{{ $fieldName }}() map[{
{{- $column := $table.Lookup $columnName }}
{{- $fieldName := pluralize $column.FieldName }}
func ( {{ $receiver }} {{ $sliceTypeName }}) GroupBy{{ $fieldName }}() map[{{ $column.TypeName }}]{{ $sliceTypeName }} {
m := make(map[{{ $column.TypeName }}]{{ $sliceTypeName }}, len({{ $receiver }}))
for _, v := range {{ $receiver }} {
m[v.{{ $column.FieldName }}] = append(m[v.{{ $column.FieldName }}], v)
_m := make(map[{{ $column.TypeName }}]{{ $sliceTypeName }}, len({{ $receiver }}))
for _, _v := range {{ $receiver }} {
_m[_v.{{ $column.FieldName }}] = append(_m[_v.{{ $column.FieldName }}], _v)
}
return m
return _m
}
{{ end }}
{{- end }}
Expand Down
12 changes: 6 additions & 6 deletions template/plugins/timeHooks.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
{{ if not (empty .Args.create) }}
{{- $createHookColumns := splitList "," .Args.create }}
{{- $insertSQLTypeName := printf "%sInsertSQL" ($structName | untitle) }}
func ({{$receiver}} {{$structName}}) DefaultInsertHook(q {{ $insertSQLTypeName }}) ({{ $insertSQLTypeName }}, error) {
func ({{$receiver}} {{$structName}}) DefaultInsertHook(_q {{ $insertSQLTypeName }}) ({{ $insertSQLTypeName }}, error) {
now := time.Now()
return q.
return _q.
{{- $lastIndex := sub (len $createHookColumns) 1 }}
{{- range $index, $column := $createHookColumns }}
Value{{ $column }}(now){{ if ne $lastIndex $index }}.{{ end }}
Expand All @@ -17,9 +17,9 @@ func ({{$receiver}} {{$structName}}) DefaultInsertHook(q {{ $insertSQLTypeName }
{{ if not (empty .Args.update) }}
{{- $updateHookColumns := splitList "," .Args.update }}
{{- $updateSQLTypeName := printf "%sUpdateSQL" ($structName | untitle) }}
func ({{$receiver}} {{$structName}}) DefaultUpdateHook(q {{ $updateSQLTypeName }}) ({{ $updateSQLTypeName }}, error) {
func ({{$receiver}} {{$structName}}) DefaultUpdateHook(_q {{ $updateSQLTypeName }}) ({{ $updateSQLTypeName }}, error) {
now := time.Now()
return q.
return _q.
{{- $lastIndex := sub (len $updateHookColumns) 1 }}
{{- range $index, $column := $updateHookColumns }}
Set{{ $column }}(now){{ if ne $lastIndex $index }}.{{ end }}
Expand All @@ -30,8 +30,8 @@ func ({{$receiver}} {{$structName}}) DefaultUpdateHook(q {{ $updateSQLTypeName }
{{ if not (empty .Args.sameOnUpdate) }}
{{- $sameOnUpdateColumns := splitList "," .Args.sameOnUpdate }}
{{- $insertOnDuplicateKeyUpdateSQLTypeName := printf "%sInsertOnDuplicateKeyUpdateSQL" (.Table.StructName | untitle) }}
func ({{$receiver}} {{$structName}}) DefaultInsertOnDuplicateKeyUpdateHook(q {{ $insertOnDuplicateKeyUpdateSQLTypeName }}) ({{ $insertOnDuplicateKeyUpdateSQLTypeName }}, error) {
return q.
func ({{$receiver}} {{$structName}}) DefaultInsertOnDuplicateKeyUpdateHook(_q {{ $insertOnDuplicateKeyUpdateSQLTypeName }}) ({{ $insertOnDuplicateKeyUpdateSQLTypeName }}, error) {
return _q.
{{- $lastIndex := sub (len $sameOnUpdateColumns) 1 }}
{{- range $index, $column := $sameOnUpdateColumns }}
SameOnUpdate{{ $column }}(){{ if ne $lastIndex $index }}.{{ end }}
Expand Down