Rewrite to_one relationships with text helpers.

- Fix a gross if statement.

templates.go

@@ -137,6 +137,7 @@ var templateFunctions = template.FuncMap{
 	"whereClause": strmangle.WhereClause,
 
 	// Text helpers
+	"textsFromForeignKey":   textsFromForeignKey,
 	"textsFromRelationship": textsFromRelationship,
 
 	// dbdrivers ops

templates/04_relationship_to_one.tpl

@@ -1,29 +1,29 @@
 {{- if .Table.IsJoinTable -}}
 {{- else -}}
-  {{- $pkg := .PkgName -}}
+  {{- $dot := . -}}
-  {{- $localTable := .Table.Name | singular | titleCase -}}
   {{- range .Table.FKeys -}}
-    {{- $localColumn := .Column | remove "_id" | singular | titleCase -}}
+    {{- $rel := textsFromForeignKey $dot.Tables $dot.Table . -}}
-    {{- $foreignColumn := .ForeignColumn | remove "_id" | singular | titleCase -}}
+// {{$rel.LocalTable.ColumnNameGo}} pointed to by the foreign key.
-    {{- $foreignTable := .ForeignTable | singular | titleCase -}}
+func ({{$rel.Function.Receiver}} *{{$rel.LocalTable.NameGo}}) {{$rel.LocalTable.ColumnNameGo}}(selectCols ...string) (*{{$rel.ForeignTable.NameGo}}, error) {
-    {{- $varname := .ForeignTable | singular | camelCase -}}
+  return {{$rel.Function.Receiver}}.{{$rel.LocalTable.ColumnNameGo}}X(boil.GetDB(), selectCols...)
-    {{- $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...)
 }
 
-// {{$localColumn}} fetches the {{$foreignTable}} pointed to by the foreign key.
+// {{$rel.LocalTable.ColumnNameGo}} pointed to by the foreign key.
-func ({{$receiver}} *{{$localTable}}) {{$localColumn}}X(exec boil.Executor, selectCols ...string) (*{{$foreignTable}}, error) {
+func ({{$rel.Function.Receiver}} *{{$rel.LocalTable.NameGo}}) {{$rel.LocalTable.ColumnNameGo}}X(exec boil.Executor, selectCols ...string) (*{{$rel.ForeignTable.NameGo}}, error) {
-  {{$varname}} := &{{$foreignTable}}{}
+  {{$rel.Function.Varname}} := &{{$rel.ForeignTable.NameGo}}{}
 
-  query := fmt.Sprintf(`select "%s" from {{.ForeignTable}} where {{.Column}} = $1`, strings.Join(selectCols, `","`))
+  selectColumns := `*`
-  err := exec.QueryRow(query, {{$receiver}}.{{titleCase .Column}}).Scan(boil.GetStructPointers({{$varname}}, selectCols...)...)
+  if len(selectCols) != 0 {
-  if err != nil {
+    selectColumns = fmt.Sprintf(`"%s"`, strings.Join(selectCols, `","`))
-    return nil, fmt.Errorf(`{{$pkg}}: unable to select from {{.ForeignTable}}: %v`, err)
   }
 
-  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 -}}

templates/05_relationship_to_many.tpl

@@ -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
+  selectColumns := `*`
-  if len(selectCols) > 0 {
+  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)