From 91bb5ee940ca9ef6a89363a8df1efc211dcbe4b0 Mon Sep 17 00:00:00 2001
From: Patrick O'brien <nullbio@users.noreply.github.com>
Date: Tue, 13 Sep 2016 19:46:32 +1000
Subject: [PATCH] Change Exec funcs to methods with Query receiver

---
 boil/query.go              | 6 +++---
 boil/reflect.go            | 2 +-
 templates/03_finishers.tpl | 4 ++--
 templates/13_update.tpl    | 2 +-
 templates/15_delete.tpl    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/boil/query.go b/boil/query.go
index ae10ce2..5ae5fab 100644
--- a/boil/query.go
+++ b/boil/query.go
@@ -97,7 +97,7 @@ func SQLG(query string, args ...interface{}) *Query {
 }
 
 // ExecQuery executes a query that does not need a row returned
-func ExecQuery(q *Query) (sql.Result, error) {
+func (q *Query) ExecQuery() (sql.Result, error) {
 	qs, args := buildQuery(q)
 	if DebugMode {
 		fmt.Fprintln(DebugWriter, qs)
@@ -107,7 +107,7 @@ func ExecQuery(q *Query) (sql.Result, error) {
 }
 
 // ExecQueryOne executes the query for the One finisher and returns a row
-func ExecQueryOne(q *Query) *sql.Row {
+func (q *Query) ExecQueryOne() *sql.Row {
 	qs, args := buildQuery(q)
 	if DebugMode {
 		fmt.Fprintln(DebugWriter, qs)
@@ -117,7 +117,7 @@ func ExecQueryOne(q *Query) *sql.Row {
 }
 
 // ExecQueryAll executes the query for the All finisher and returns multiple rows
-func ExecQueryAll(q *Query) (*sql.Rows, error) {
+func (q *Query) ExecQueryAll() (*sql.Rows, error) {
 	qs, args := buildQuery(q)
 	if DebugMode {
 		fmt.Fprintln(DebugWriter, qs)
diff --git a/boil/reflect.go b/boil/reflect.go
index d4c4dee..dd961bb 100644
--- a/boil/reflect.go
+++ b/boil/reflect.go
@@ -100,7 +100,7 @@ func (q *Query) Bind(obj interface{}) error {
 		return err
 	}
 
-	rows, err := ExecQueryAll(q)
+	rows, err := q.ExecQueryAll()
 	if err != nil {
 		return errors.Wrap(err, "bind failed to execute query")
 	}
diff --git a/templates/03_finishers.tpl b/templates/03_finishers.tpl
index 970aa37..a0de3fc 100644
--- a/templates/03_finishers.tpl
+++ b/templates/03_finishers.tpl
@@ -82,7 +82,7 @@ func (q {{$varNameSingular}}Query) Count() (int64, error) {
   boil.SetSelect(q.Query, nil)
   boil.SetCount(q.Query)
 
-  err := boil.ExecQueryOne(q.Query).Scan(&count)
+  err := q.Query.ExecQueryOne().Scan(&count)
   if err != nil {
     return 0, errors.Wrap(err, "{{.PkgName}}: failed to count {{.Table.Name}} rows")
   }
@@ -107,7 +107,7 @@ func (q {{$varNameSingular}}Query) Exists() (bool, error) {
   boil.SetCount(q.Query)
   boil.SetLimit(q.Query, 1)
 
-  err := boil.ExecQueryOne(q.Query).Scan(&count)
+  err := q.Query.ExecQueryOne().Scan(&count)
   if err != nil {
     return false, errors.Wrap(err, "{{.PkgName}}: failed to check if {{.Table.Name}} exists")
   }
diff --git a/templates/13_update.tpl b/templates/13_update.tpl
index a7cd034..28c6631 100644
--- a/templates/13_update.tpl
+++ b/templates/13_update.tpl
@@ -107,7 +107,7 @@ func (q {{$varNameSingular}}Query) UpdateAllP(cols M) {
 func (q {{$varNameSingular}}Query) UpdateAll(cols M) error {
   boil.SetUpdate(q.Query, cols)
 
-  _, err := boil.ExecQuery(q.Query)
+  _, err := q.Query.ExecQuery()
   if err != nil {
     return errors.Wrap(err, "{{.PkgName}}: unable to update all for {{.Table.Name}}")
   }
diff --git a/templates/15_delete.tpl b/templates/15_delete.tpl
index 025c5ba..2f6d6d9 100644
--- a/templates/15_delete.tpl
+++ b/templates/15_delete.tpl
@@ -80,7 +80,7 @@ func (q {{$varNameSingular}}Query) DeleteAll() error {
 
   boil.SetDelete(q.Query)
 
-  _, err := boil.ExecQuery(q.Query)
+  _, err := q.Query.ExecQuery()
   if err != nil {
     return errors.Wrap(err, "{{.PkgName}}: unable to delete all from {{.Table.Name}}")
   }