Moving scanner outside fetch.go.

util/sqlutil/fetch.go

@@ -22,7 +22,6 @@
 package sqlutil
 
 import (
-	"database/sql"
 	"errors"
 	"reflect"
 
@@ -214,19 +213,9 @@ func fieldsByTraversal(v reflect.Value, traversals [][]int, values []interface{}
 
 		// Provides compatibility with db.Unmarshaler
 		if u, ok := values[i].(db.Unmarshaler); ok {
-			values[i] = valueUnmarshaler{u}
+			values[i] = scanner{u}
 		}
 
 	}
 	return nil
 }
-
-type valueUnmarshaler struct {
-	v db.Unmarshaler
-}
-
-func (u valueUnmarshaler) Scan(v interface{}) error {
-	return u.v.UnmarshalDB(v)
-}
-
-var _ sql.Scanner = valueUnmarshaler{}

util/sqlutil/scanner.go

+// Copyright (c) 2012-2015 José Carlos Nieto, https://menteslibres.net/xiam
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+package sqlutil
+
+import (
+	"database/sql"
+	"upper.io/db"
+)
+
+type scanner struct {
+	v db.Unmarshaler
+}
+
+func (u scanner) Scan(v interface{}) error {
+	return u.v.UnmarshalDB(v)
+}
+
+var _ sql.Scanner = scanner{}