From 5e98fb6f710ef70116de555097cfd407464d275a Mon Sep 17 00:00:00 2001
From: Nikita Karmatskikh <nickkarmatskikh@gmail.com>
Date: Tue, 23 Nov 2021 13:54:51 +0300
Subject: [PATCH] queryx: make bindStructArgs and bindMapArgs as methods

---
 queryx.go      | 22 +++++++++++-----------
 queryx_test.go | 12 ++++++------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/queryx.go b/queryx.go
index 25d69e8..5a38852 100644
--- a/queryx.go
+++ b/queryx.go
@@ -110,7 +110,7 @@ func Query(q *gocql.Query, names []string) *Queryx {
 // BindStruct binds query named parameters to values from arg using mapper. If
 // value cannot be found error is reported.
 func (q *Queryx) BindStruct(arg interface{}) *Queryx {
-	arglist, err := bindStructArgs(q.Names, arg, nil, q.Mapper)
+	arglist, err := q.bindStructArgs(arg, nil)
 	if err != nil {
 		q.err = fmt.Errorf("bind error: %s", err)
 	} else {
@@ -125,7 +125,7 @@ func (q *Queryx) BindStruct(arg interface{}) *Queryx {
 // using a mapper. If value cannot be found in arg0 it's looked up in arg1
 // before reporting an error.
 func (q *Queryx) BindStructMap(arg0 interface{}, arg1 map[string]interface{}) *Queryx {
-	arglist, err := bindStructArgs(q.Names, arg0, arg1, q.Mapper)
+	arglist, err := q.bindStructArgs(arg0, arg1)
 	if err != nil {
 		q.err = fmt.Errorf("bind error: %s", err)
 	} else {
@@ -136,8 +136,8 @@ func (q *Queryx) BindStructMap(arg0 interface{}, arg1 map[string]interface{}) *Q
 	return q
 }
 
-func bindStructArgs(names []string, arg0 interface{}, arg1 map[string]interface{}, m *reflectx.Mapper) ([]interface{}, error) {
-	arglist := make([]interface{}, 0, len(names))
+func (q *Queryx) bindStructArgs(arg0 interface{}, arg1 map[string]interface{}) ([]interface{}, error) {
+	arglist := make([]interface{}, 0, len(q.Names))
 
 	// grab the indirected value of arg
 	v := reflect.ValueOf(arg0)
@@ -145,14 +145,14 @@ func bindStructArgs(names []string, arg0 interface{}, arg1 map[string]interface{
 		v = v.Elem()
 	}
 
-	err := m.TraversalsByNameFunc(v.Type(), names, func(i int, t []int) error {
+	err := q.Mapper.TraversalsByNameFunc(v.Type(), q.Names, func(i int, t []int) error {
 		if len(t) != 0 {
 			val := reflectx.FieldByIndexesReadOnly(v, t) // nolint:scopelint
 			arglist = append(arglist, val.Interface())
 		} else {
-			val, ok := arg1[names[i]]
+			val, ok := arg1[q.Names[i]]
 			if !ok {
-				return fmt.Errorf("could not find name %q in %#v and %#v", names[i], arg0, arg1)
+				return fmt.Errorf("could not find name %q in %#v and %#v", q.Names[i], arg0, arg1)
 			}
 			arglist = append(arglist, val)
 		}
@@ -165,7 +165,7 @@ func bindStructArgs(names []string, arg0 interface{}, arg1 map[string]interface{
 
 // BindMap binds query named parameters using map.
 func (q *Queryx) BindMap(arg map[string]interface{}) *Queryx {
-	arglist, err := bindMapArgs(q.Names, arg)
+	arglist, err := q.bindMapArgs(arg)
 	if err != nil {
 		q.err = fmt.Errorf("bind error: %s", err)
 	} else {
@@ -176,10 +176,10 @@ func (q *Queryx) BindMap(arg map[string]interface{}) *Queryx {
 	return q
 }
 
-func bindMapArgs(names []string, arg map[string]interface{}) ([]interface{}, error) {
-	arglist := make([]interface{}, 0, len(names))
+func (q *Queryx) bindMapArgs(arg map[string]interface{}) ([]interface{}, error) {
+	arglist := make([]interface{}, 0, len(q.Names))
 
-	for _, name := range names {
+	for _, name := range q.Names {
 		val, ok := arg[name]
 		if !ok {
 			return arglist, fmt.Errorf("could not find name %q in %#v", name, arg)
diff --git a/queryx_test.go b/queryx_test.go
index ffc492e..27535b1 100644
--- a/queryx_test.go
+++ b/queryx_test.go
@@ -78,7 +78,7 @@ func TestQueryxBindStruct(t *testing.T) {
 
 	t.Run("simple", func(t *testing.T) {
 		names := []string{"name", "age", "first", "last"}
-		args, err := bindStructArgs(names, v, nil, DefaultMapper)
+		args, err := Query(nil, names).bindStructArgs(v, nil)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -90,7 +90,7 @@ func TestQueryxBindStruct(t *testing.T) {
 
 	t.Run("error", func(t *testing.T) {
 		names := []string{"name", "age", "first", "not_found"}
-		_, err := bindStructArgs(names, v, nil, DefaultMapper)
+		_, err := Query(nil, names).bindStructArgs(v, nil)
 		if err == nil {
 			t.Fatal("unexpected error")
 		}
@@ -101,7 +101,7 @@ func TestQueryxBindStruct(t *testing.T) {
 		m := map[string]interface{}{
 			"not_found": "last",
 		}
-		args, err := bindStructArgs(names, v, m, DefaultMapper)
+		args, err := Query(nil, names).bindStructArgs(v, m)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -116,7 +116,7 @@ func TestQueryxBindStruct(t *testing.T) {
 		m := map[string]interface{}{
 			"not_found": "last",
 		}
-		_, err := bindStructArgs(names, v, m, DefaultMapper)
+		_, err := Query(nil, names).bindStructArgs(v, m)
 		if err == nil {
 			t.Fatal("unexpected error")
 		}
@@ -133,7 +133,7 @@ func TestQueryxBindMap(t *testing.T) {
 
 	t.Run("simple", func(t *testing.T) {
 		names := []string{"name", "age", "first", "last"}
-		args, err := bindMapArgs(names, v)
+		args, err := Query(nil, names).bindMapArgs(v)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -145,7 +145,7 @@ func TestQueryxBindMap(t *testing.T) {
 
 	t.Run("error", func(t *testing.T) {
 		names := []string{"name", "first", "not_found"}
-		_, err := bindMapArgs(names, v)
+		_, err := Query(nil, names).bindMapArgs(v)
 		if err == nil {
 			t.Fatal("unexpected error")
 		}