From 8831e8a4b902fa91d4e731b988dfc9f124f89a62 Mon Sep 17 00:00:00 2001
From: Patrick O'brien <nullbio@users.noreply.github.com>
Date: Sun, 14 Aug 2016 02:58:18 +1000
Subject: [PATCH] Fix debug outputs for all templates

---
 templates/07_find.tpl   |  1 +
 templates/09_update.tpl | 19 +++++++++++--------
 templates/10_upsert.tpl | 10 +++++-----
 templates/11_delete.tpl | 13 +++++--------
 templates/12_reload.tpl |  5 -----
 templates/13_exists.tpl | 11 ++++++-----
 6 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/templates/07_find.tpl b/templates/07_find.tpl
index 8ecc39c..60549a7 100644
--- a/templates/07_find.tpl
+++ b/templates/07_find.tpl
@@ -31,6 +31,7 @@ func {{$tableNameSingular}}Find(exec boil.Executor, {{$pkArgs}}, selectCols ...s
   sql := fmt.Sprintf(
     `select %s from "{{.Table.Name}}" where {{whereClause 1 .Table.PKey.Columns}}`, sel,
   )
+
   q := boil.SQL(sql, {{$pkNames | join ", "}})
   boil.SetExecutor(q, exec)
 
diff --git a/templates/09_update.tpl b/templates/09_update.tpl
index f886612..4b0e2e8 100644
--- a/templates/09_update.tpl
+++ b/templates/09_update.tpl
@@ -47,16 +47,17 @@ func (o *{{$tableNameSingular}}) Update(exec boil.Executor, whitelist ... string
     query = fmt.Sprintf(`UPDATE {{.Table.Name}} SET %s WHERE %s`, strmangle.SetParamNames(wl), strmangle.WhereClause(len(wl)+1, {{$varNameSingular}}PrimaryKeyColumns))
     values = boil.GetStructValues(o, wl...)
     values = append(values, {{.Table.PKey.Columns | stringMap .StringFuncs.titleCase | prefixStringSlice "o." | join ", "}})
+
+    if boil.DebugMode {
+      fmt.Fprintln(boil.DebugWriter, query)
+      fmt.Fprintln(boil.DebugWriter, values)
+    }
+
     _, err = exec.Exec(query, values...)
   } else {
     return fmt.Errorf("{{.PkgName}}: unable to update {{.Table.Name}}, could not build whitelist")
   }
 
-  if boil.DebugMode {
-    fmt.Fprintln(boil.DebugWriter, query)
-    fmt.Fprintln(boil.DebugWriter, values)
-  }
-
   if err != nil {
     return fmt.Errorf("{{.PkgName}}: unable to update {{.Table.Name}} row: %s", err)
   }
@@ -137,10 +138,12 @@ func (o {{$tableNameSingular}}Slice) UpdateAll(exec boil.Executor, cols M) error
     strmangle.Placeholders(len(o) * len({{$varNameSingular}}PrimaryKeyColumns), len(colNames)+1, len({{$varNameSingular}}PrimaryKeyColumns)),
   )
 
-  q := boil.SQL(sql, args...)
-  boil.SetExecutor(q, exec)
+  if boil.DebugMode {
+    fmt.Fprintln(boil.DebugWriter, sql)
+    fmt.Fprintln(boil.DebugWriter, args...)
+  }
 
-  _, err := boil.ExecQuery(q)
+  _, err := exec.Exec(sql, args...)
   if err != nil {
     return fmt.Errorf("{{.PkgName}}: unable to update all in {{$varNameSingular}} slice: %s", err)
   }
diff --git a/templates/10_upsert.tpl b/templates/10_upsert.tpl
index 0a64d44..7216fe2 100644
--- a/templates/10_upsert.tpl
+++ b/templates/10_upsert.tpl
@@ -34,17 +34,17 @@ func (o *{{$tableNameSingular}}) Upsert(exec boil.Executor, update bool, conflic
     return err
   }
 
+  if boil.DebugMode {
+    fmt.Fprintln(boil.DebugWriter, query)
+    fmt.Fprintln(boil.DebugWriter, boil.GetStructValues(o, columns.whitelist...))
+  }
+
   if len(columns.returning) != 0 {
     err = exec.QueryRow(query, boil.GetStructValues(o, columns.whitelist...)...).Scan(boil.GetStructPointers(o, columns.returning...)...)
   } else {
     _, err = exec.Exec(query, {{.Table.Columns | columnNames | stringMap .StringFuncs.titleCase | prefixStringSlice "o." | join ", "}})
   }
 
-  if boil.DebugMode {
-		fmt.Fprintln(boil.DebugWriter, query)
-    fmt.Fprintln(boil.DebugWriter, boil.GetStructValues(o, columns.whitelist...))
-  }
-
   if err != nil {
     return fmt.Errorf("{{.PkgName}}: unable to upsert for {{.Table.Name}}: %s", err)
   }
diff --git a/templates/11_delete.tpl b/templates/11_delete.tpl
index 21e7915..0e1bb8e 100644
--- a/templates/11_delete.tpl
+++ b/templates/11_delete.tpl
@@ -116,18 +116,15 @@ func (o {{$tableNameSingular}}Slice) DeleteAll(exec boil.Executor) error {
     strmangle.Placeholders(len(o) * len({{$varNameSingular}}PrimaryKeyColumns), 1, len({{$varNameSingular}}PrimaryKeyColumns)),
   )
 
-  q := boil.SQL(sql, args...)
-  boil.SetExecutor(q, exec)
-
-  _, err := boil.ExecQuery(q)
-  if err != nil {
-    return fmt.Errorf("{{.PkgName}}: unable to delete all from {{$varNameSingular}} slice: %s", err)
-  }
-
   if boil.DebugMode {
     fmt.Fprintln(boil.DebugWriter, sql)
     fmt.Fprintln(boil.DebugWriter, args)
   }
 
+  _, err := exec.Exec(sql, args...)
+  if err != nil {
+    return fmt.Errorf("{{.PkgName}}: unable to delete all from {{$varNameSingular}} slice: %s", err)
+  }
+
   return nil
 }
diff --git a/templates/12_reload.tpl b/templates/12_reload.tpl
index 61d5d61..a3d3d37 100644
--- a/templates/12_reload.tpl
+++ b/templates/12_reload.tpl
@@ -86,10 +86,5 @@ func (o *{{$tableNameSingular}}Slice) ReloadAll(exec boil.Executor) error {
 
   *o = {{$varNamePlural}}
 
-  if boil.DebugMode {
-    fmt.Fprintln(boil.DebugWriter, sql)
-    fmt.Fprintln(boil.DebugWriter, args)
-  }
-
   return nil
 }
diff --git a/templates/13_exists.tpl b/templates/13_exists.tpl
index e0e8bdf..785a25d 100644
--- a/templates/13_exists.tpl
+++ b/templates/13_exists.tpl
@@ -7,6 +7,12 @@ func {{$tableNameSingular}}Exists(exec boil.Executor, {{$pkArgs}}) (bool, error)
   var exists bool
 
   sql := `select exists(select 1 from "{{.Table.Name}}" where {{whereClause 1 .Table.PKey.Columns}} limit 1)`
+
+  if boil.DebugMode {
+    fmt.Fprintln(boil.DebugWriter, sql)
+    fmt.Fprintln(boil.DebugWriter, {{$pkNames | join ", "}})
+  }
+
   row := exec.QueryRow(
     sql,
     {{$pkNames | join ", "}},
@@ -17,11 +23,6 @@ func {{$tableNameSingular}}Exists(exec boil.Executor, {{$pkArgs}}) (bool, error)
     return false, fmt.Errorf("{{.PkgName}}: unable to check if {{.Table.Name}} exists: %v", err)
   }
 
-  if boil.DebugMode {
-    fmt.Fprintln(boil.DebugWriter, sql)
-    fmt.Fprintln(boil.DebugWriter, {{$pkNames | join ", "}})
-  }
-
   return exists, nil
 }