Rename templates to enforce sane ordering.

templates/01_types.tpl

@@ -0,0 +1,18 @@
+{{- $varNameSingular := camelCaseSingular .Table.Name -}}
+{{- $tableNameSingular := titleCaseSingular .Table.Name -}}
+var (
+  {{$varNameSingular}}Columns = []string{{"{"}}{{columnsToStrings .Table.Columns | commaList}}{{"}"}}
+  {{$varNameSingular}}ColumnsWithoutDefault = []string{{"{"}}{{filterColumnsByDefault .Table.Columns false}}{{"}"}}
+  {{$varNameSingular}}ColumnsWithDefault = []string{{"{"}}{{filterColumnsByDefault .Table.Columns true}}{{"}"}}
+  {{$varNameSingular}}PrimaryKeyColumns = []string{{"{"}}{{commaList .Table.PKey.Columns}}{{"}"}}
+  {{$varNameSingular}}AutoIncrementColumns = []string{{"{"}}{{filterColumnsByAutoIncrement .Table.Columns}}{{"}"}}
+  {{$varNameSingular}}AutoIncPrimaryKey = "{{autoIncPrimaryKey .Table.Columns .Table.PKey}}"
+)
+
+type (
+  {{$varNameSingular}}Slice []*{{$tableNameSingular}}
+  {{$tableNameSingular}}Hook func(*{{$tableNameSingular}}) error
+  {{$varNameSingular}}Query struct {
+    *boil.Query
+  }
+)

templates/02_hooks.tpl

@@ -1,7 +1,5 @@
 {{- $tableNameSingular := titleCaseSingular .Table.Name -}}
 {{- $varNameSingular := camelCaseSingular .Table.Name -}}
-type {{$tableNameSingular}}Hook func(*{{$tableNameSingular}}) error
-
 var {{$varNameSingular}}BeforeCreateHooks []{{$tableNameSingular}}Hook
 var {{$varNameSingular}}BeforeUpdateHooks []{{$tableNameSingular}}Hook
 var {{$varNameSingular}}AfterCreateHooks []{{$tableNameSingular}}Hook

templates/03_finishers.tpl

@@ -1,7 +1,6 @@
 {{- $tableNameSingular := titleCaseSingular .Table.Name -}}
 {{- $varNameSingular := camelCaseSingular .Table.Name -}}
-type {{$varNameSingular}}Slice []*{{$tableNameSingular}}
-
+// One returns a single {{$varNameSingular}} record from the query.
 func (q {{$varNameSingular}}Query) One() (*{{$tableNameSingular}}, error) {
   o := &{{$tableNameSingular}}{}
 
@@ -16,6 +15,7 @@ func (q {{$varNameSingular}}Query) One() (*{{$tableNameSingular}}, error) {
   return o, nil
 }
 
+// All returns all {{$tableNameSingular}} records from the query.
 func (q {{$varNameSingular}}Query) All() ({{$varNameSingular}}Slice, error) {
   var o {{$varNameSingular}}Slice
 
@@ -33,6 +33,7 @@ func (q {{$varNameSingular}}Query) All() ({{$varNameSingular}}Slice, error) {
   return o, nil
 }
 
+// Count returns the count of all {{$tableNameSingular}} records in the query.
 func (q {{$varNameSingular}}Query) Count() (int64, error) {
   var count int64
 

templates/05_all.tpl

@@ -1,15 +1,12 @@
 {{- $tableNameSingular := titleCaseSingular .Table.Name -}}
 {{- $tableNamePlural := titleCasePlural .Table.Name -}}
 {{- $varNameSingular := camelCaseSingular .Table.Name -}}
-type {{$varNameSingular}}Query struct {
-  *boil.Query
-}
-
 // {{$tableNamePlural}}All retrieves all records.
 func {{$tableNamePlural}}(mods ...qm.QueryMod) {{$varNameSingular}}Query {
   return {{$tableNamePlural}}X(boil.GetDB(), mods...)
 }
 
+// {{$tableNamePlural}}X retrieves all the records using an executor.
 func {{$tableNamePlural}}X(exec boil.Executor, mods ...qm.QueryMod) {{$varNameSingular}}Query {
   mods = append(mods, qm.Table("{{.Table.Name}}"))
   return {{$varNameSingular}}Query{NewQueryX(exec, mods...)}

templates/10_helpers.tpl

@@ -0,0 +1,25 @@
+{{- $varNameSingular := camelCaseSingular .Table.Name -}}
+{{- if hasPrimaryKey .Table.PKey -}}
+{{- $tableNameSingular := titleCaseSingular .Table.Name -}}
+func (o {{$tableNameSingular}}) inPrimaryKeyArgs() []interface{} {
+  var args []interface{}
+
+  {{- range $key, $value := .Table.PKey.Columns }}
+  args = append(args, o.{{titleCase $value}})
+  {{ end -}}
+
+  return args
+}
+
+func (o {{$varNameSingular}}Slice) inPrimaryKeyArgs() []interface{} {
+  var args []interface{}
+
+  for i := 0; i < len(o); i++ {
+    {{- range $key, $value := .Table.PKey.Columns }}
+    args = append(args, o[i].{{titleCase $value}})
+    {{ end -}}
+  }
+
+  return args
+}
+{{- end}}

templates/helpers.tpl

@@ -1,32 +0,0 @@
-{{- $varNameSingular := camelCaseSingular .Table.Name -}}
-var {{$varNameSingular}}Columns = []string{{"{"}}{{columnsToStrings .Table.Columns | commaList}}{{"}"}}
-var {{$varNameSingular}}ColumnsWithoutDefault = []string{{"{"}}{{filterColumnsByDefault .Table.Columns false}}{{"}"}}
-var {{$varNameSingular}}ColumnsWithDefault = []string{{"{"}}{{filterColumnsByDefault .Table.Columns true}}{{"}"}}
-var {{$varNameSingular}}PrimaryKeyColumns = []string{{"{"}}{{commaList .Table.PKey.Columns}}{{"}"}}
-var {{$varNameSingular}}AutoIncrementColumns = []string{{"{"}}{{filterColumnsByAutoIncrement .Table.Columns}}{{"}"}}
-var {{$varNameSingular}}AutoIncPrimaryKey = "{{autoIncPrimaryKey .Table.Columns .Table.PKey}}"
-
-{{if hasPrimaryKey .Table.PKey -}}
-{{- $tableNameSingular := titleCaseSingular .Table.Name -}}
-func (o {{$tableNameSingular}}) inPrimaryKeyArgs() []interface{} {
-  var args []interface{}
-
-  {{- range $key, $value := .Table.PKey.Columns }}
-  args = append(args, o.{{titleCase $value}})
-  {{ end -}}
-
-  return args
-}
-
-func (o {{$varNameSingular}}Slice) inPrimaryKeyArgs() []interface{} {
-  var args []interface{}
-
-  for i := 0; i < len(o); i++ {
-    {{- range $key, $value := .Table.PKey.Columns }}
-    args = append(args, o[i].{{titleCase $value}})
-    {{ end -}}
-  }
-
-  return args
-}
-{{- end}}