From a1b14f4eae9680b4fcb3696065ce1bca017c6f5f Mon Sep 17 00:00:00 2001 From: Aaron L <aaron@bettercoder.net> Date: Wed, 3 Aug 2016 22:34:46 -0700 Subject: [PATCH] Fix struct tag generation. - Clean up template --- templates/00_struct.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/00_struct.tpl b/templates/00_struct.tpl index 2342fd3..f0952c7 100644 --- a/templates/00_struct.tpl +++ b/templates/00_struct.tpl @@ -1,8 +1,8 @@ -{{- $tableNameSingular := .Table.Name | singular | titleCase -}} -{{- $dbName := singular .Table.Name -}} -// {{$tableNameSingular}} is an object representing the database table. -type {{$tableNameSingular}} struct { - {{range $key, $value := .Table.Columns -}} - {{titleCase $value.Name}} {{$value.Type}} `db:"{{makeDBName $dbName $value.Name}}" json:"{{$value.Name}}"` +{{- $tableNameSingular := .Table.Name | singular -}} +{{- $modelName := $tableNameSingular | titleCase -}} +// {{$modelName}} is an object representing the database table. +type {{$modelName}} struct { + {{range $column := .Table.Columns -}} + {{titleCase $column.Name}} {{$column.Type}} `boil:"{{printf "%s.%s" $tableNameSingular $column.Name}}" json:"{{$column.Name}}"` {{end -}} }