Correct the problems with to_one

This commit is contained in:
Aaron L 2016-08-05 22:19:49 -07:00
parent ac549c9207
commit 2d608c4e17
2 changed files with 7 additions and 5 deletions

View file

@ -26,13 +26,16 @@ func ({{.Function.Receiver}} *{{.LocalTable.NameGo}}) {{.Function.Name}}P(exec b
// {{.Function.Name}} pointed to by the foreign key. // {{.Function.Name}} pointed to by the foreign key.
func ({{.Function.Receiver}} *{{.LocalTable.NameGo}}) {{.Function.Name}}(exec boil.Executor, mods ...qm.QueryMod) (*{{.ForeignTable.NameGo}}, error) { func ({{.Function.Receiver}} *{{.LocalTable.NameGo}}) {{.Function.Name}}(exec boil.Executor, mods ...qm.QueryMod) (*{{.ForeignTable.NameGo}}, error) {
queryMods := make([]qm.QueryMod, 2, len(mods)+2) queryMods := []qm.QueryMod{
queryMods[0] = qm.From("{{.ForeignTable.Name}}") qm.Where("{{.ForeignTable.ColumnName}}=$1", {{.Function.Receiver}}.{{.LocalTable.ColumnNameGo}}),
queryMods[1] = qm.Where("{{.ForeignTable.ColumnName}}=$1", {{.Function.Receiver}}.{{.LocalTable.ColumnNameGo}}) }
queryMods = append(queryMods, mods...) queryMods = append(queryMods, mods...)
return {{.ForeignTable.NamePluralGo}}(exec, queryMods...).One() query := {{.ForeignTable.NamePluralGo}}(exec, queryMods...)
boil.SetFrom(query.Query, "{{.ForeignTable.Name}}")
return query.One()
} }
{{end -}} {{end -}}

View file

@ -1,6 +1,5 @@
{{- define "relationship_to_one_test_helper"}} {{- define "relationship_to_one_test_helper"}}
func Test{{.LocalTable.NameGo}}ToOne{{.ForeignTable.NameGo}}_{{.Function.Name}}(t *testing.T) { func Test{{.LocalTable.NameGo}}ToOne{{.ForeignTable.NameGo}}_{{.Function.Name}}(t *testing.T) {
t.Skip("this test is broke too")
tx := MustTx(boil.Begin()) tx := MustTx(boil.Begin())
defer tx.Rollback() defer tx.Rollback()