Unify Bind() result and error handling with v3

A bug was recently fixed with Bind() where it would consume the entire
result set when asked to bind to a single object. However the for loop
always completed by .Next() returning false. This implicitly closed the
rows. Now that we break at the correct time for .One() type queries this
bug was introduced.

We deferred the close of the rows, so that result set is still opened
when eager loading begins. This caused problems with psql transactions
when eager loading.

Also, awkwardly enough this wasn't a bug in v3 because it was handling
things differently, so we simply make the code the same and it should
fix it nicely.

- Explicitly close rows in queries.Bind()
- Fix #318

Author: aarondl

main.go

@@ -14,7 +14,7 @@ import (
 	"github.com/volatiletech/sqlboiler/boilingcore"
 )
 
-const sqlBoilerVersion = "2.7.2"
+const sqlBoilerVersion = "2.7.3"
 
 var (
 	flagConfigFile string

queries/reflect.go

@@ -46,7 +46,9 @@ func (q *Query) BindP(obj interface{}) {
 }
 
 // Bind executes the query and inserts the
-// result into the passed in object pointer
+// result into the passed in object pointer.
+//
+// The caller is responsible for closing the rows.
 //
 // Bind rules:
 //   - Struct tags control bind, in the form of: `boil:"name,bind"`
@@ -92,7 +94,7 @@ func Bind(rows *sql.Rows, obj interface{}) error {
 }
 
 // Bind executes the query and inserts the
-// result into the passed in object pointer
+// result into the passed in object pointer.
 //
 // See documentation for boil.Bind()
 func (q *Query) Bind(obj interface{}) error {
@@ -105,9 +107,18 @@ func (q *Query) Bind(obj interface{}) error {
 	if err != nil {
 		return errors.Wrap(err, "bind failed to execute query")
 	}
-	defer rows.Close()
-	if res := bind(rows, obj, structType, sliceType, bkind); res != nil {
-		return res
+	if err = bind(rows, obj, structType, sliceType, bkind); err != nil {
+		if innerErr := rows.Close(); innerErr != nil {
+			return errors.Wrapf(err, "error on rows.Close after bind error: %+v", innerErr)
+		}
+
+		return err
+	}
+	if err = rows.Close(); err != nil {
+		return errors.Wrap(err, "failed to clean up rows in bind")
+	}
+	if err = rows.Err(); err != nil {
+		return errors.Wrap(err, "error from rows in bind")
 	}
 
 	if len(q.load) != 0 {