Rewrite to_one relationships with text helpers.
- Fix a gross if statement.
This commit is contained in:
parent
32b2581ead
commit
6ddef6095e
3 changed files with 21 additions and 22 deletions
|
@ -137,6 +137,7 @@ var templateFunctions = template.FuncMap{
|
|||
"whereClause": strmangle.WhereClause,
|
||||
|
||||
// Text helpers
|
||||
"textsFromForeignKey": textsFromForeignKey,
|
||||
"textsFromRelationship": textsFromRelationship,
|
||||
|
||||
// dbdrivers ops
|
||||
|
|
|
@ -1,29 +1,29 @@
|
|||
{{- if .Table.IsJoinTable -}}
|
||||
{{- else -}}
|
||||
{{- $pkg := .PkgName -}}
|
||||
{{- $localTable := .Table.Name | singular | titleCase -}}
|
||||
{{- $dot := . -}}
|
||||
{{- range .Table.FKeys -}}
|
||||
{{- $localColumn := .Column | remove "_id" | singular | titleCase -}}
|
||||
{{- $foreignColumn := .ForeignColumn | remove "_id" | singular | titleCase -}}
|
||||
{{- $foreignTable := .ForeignTable | singular | titleCase -}}
|
||||
{{- $varname := .ForeignTable | singular | camelCase -}}
|
||||
{{- $receiver := $localTable | toLower | substring 0 1 -}}
|
||||
// {{$localColumn}} fetches the {{$foreignTable}} pointed to by the foreign key.
|
||||
func ({{$receiver}} *{{$localTable}}) {{$localColumn}}(selectCols ...string) (*{{$foreignTable}}, error) {
|
||||
return {{$receiver}}.{{$localColumn}}X(boil.GetDB(), selectCols...)
|
||||
{{- $rel := textsFromForeignKey $dot.Tables $dot.Table . -}}
|
||||
// {{$rel.LocalTable.ColumnNameGo}} pointed to by the foreign key.
|
||||
func ({{$rel.Function.Receiver}} *{{$rel.LocalTable.NameGo}}) {{$rel.LocalTable.ColumnNameGo}}(selectCols ...string) (*{{$rel.ForeignTable.NameGo}}, error) {
|
||||
return {{$rel.Function.Receiver}}.{{$rel.LocalTable.ColumnNameGo}}X(boil.GetDB(), selectCols...)
|
||||
}
|
||||
|
||||
// {{$localColumn}} fetches the {{$foreignTable}} pointed to by the foreign key.
|
||||
func ({{$receiver}} *{{$localTable}}) {{$localColumn}}X(exec boil.Executor, selectCols ...string) (*{{$foreignTable}}, error) {
|
||||
{{$varname}} := &{{$foreignTable}}{}
|
||||
// {{$rel.LocalTable.ColumnNameGo}} pointed to by the foreign key.
|
||||
func ({{$rel.Function.Receiver}} *{{$rel.LocalTable.NameGo}}) {{$rel.LocalTable.ColumnNameGo}}X(exec boil.Executor, selectCols ...string) (*{{$rel.ForeignTable.NameGo}}, error) {
|
||||
{{$rel.Function.Varname}} := &{{$rel.ForeignTable.NameGo}}{}
|
||||
|
||||
query := fmt.Sprintf(`select "%s" from {{.ForeignTable}} where {{.Column}} = $1`, strings.Join(selectCols, `","`))
|
||||
err := exec.QueryRow(query, {{$receiver}}.{{titleCase .Column}}).Scan(boil.GetStructPointers({{$varname}}, selectCols...)...)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf(`{{$pkg}}: unable to select from {{.ForeignTable}}: %v`, err)
|
||||
selectColumns := `*`
|
||||
if len(selectCols) != 0 {
|
||||
selectColumns = fmt.Sprintf(`"%s"`, strings.Join(selectCols, `","`))
|
||||
}
|
||||
|
||||
return {{$varname}}, nil
|
||||
query := fmt.Sprintf(`select %s from {{.ForeignTable}} where "{{.ForeignColumn}}" = $1`, selectColumns)
|
||||
err := exec.QueryRow(query, {{$rel.Function.Receiver}}.{{titleCase .Column}}).Scan(boil.GetStructPointers({{$rel.Function.Varname}}, selectCols...)...)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf(`{{$dot.PkgName}}: unable to select from {{.ForeignTable}}: %v`, err)
|
||||
}
|
||||
|
||||
return {{$rel.Function.Varname}}, nil
|
||||
}
|
||||
|
||||
{{end -}}
|
||||
|
|
|
@ -15,11 +15,9 @@ func ({{$rel.Function.Receiver}} *{{$rel.LocalTable.NameGo}}) {{$rel.Function.Na
|
|||
func ({{$rel.Function.Receiver}} *{{$rel.LocalTable.NameGo}}) {{$rel.Function.Name}}X(exec boil.Executor, selectCols ...string) ({{$rel.ForeignTable.Slice}}, error) {
|
||||
var ret {{$rel.ForeignTable.Slice}}
|
||||
|
||||
var selectColumns string
|
||||
if len(selectCols) > 0 {
|
||||
selectColumns := `*`
|
||||
if len(selectCols) != 0 {
|
||||
selectColumns = `"{{id 0}}".` + strings.Join(selectCols, `","{{id 0}}"."`)
|
||||
} else {
|
||||
selectColumns = "*"
|
||||
}
|
||||
{{if .ToJoinTable -}}
|
||||
query := fmt.Sprintf(`select %s from {{.ForeignTable}} "{{id 0}}" inner join {{.JoinTable}} as "{{id 1}}" on "{{id 1}}"."{{.JoinForeignColumn}}" = "{{id 0}}"."{{.ForeignColumn}}" where "{{id 1}}"."{{.JoinLocalColumn}}"=$1`, selectColumns)
|
||||
|
|
Loading…
Add table
Reference in a new issue