reflectx: use github.com/scylladb/go-reflectx

Signed-off-by: Michał Matczuk <[email protected]>

Makefile

@@ -27,7 +27,7 @@ test:
 	@$(GOTEST) .
 	@$(GOTEST) ./migrate
 	@$(GOTEST) ./qb
-	@$(GOTEST) ./reflectx
+	@$(GOTEST) ./table
 
 .PHONY: bench
 bench:

go.mod

@@ -3,4 +3,5 @@ module github.com/scylladb/gocqlx
 require (
 	github.com/gocql/gocql v0.0.0-20181124151448-70385f88b28b
 	github.com/google/go-cmp v0.2.0
+	github.com/scylladb/go-reflectx v1.0.0
 )

gocqlx.go

@@ -10,7 +10,7 @@ import (
 	"reflect"
 
 	"github.com/gocql/gocql"
-	"github.com/scylladb/gocqlx/reflectx"
+	"github.com/scylladb/go-reflectx"
 )
 
 // structOnlyError returns an error appropriate for type when a non-scannable

iterx.go

@@ -10,7 +10,7 @@ import (
 	"reflect"
 
 	"github.com/gocql/gocql"
-	"github.com/scylladb/gocqlx/reflectx"
+	"github.com/scylladb/go-reflectx"
 )
 
 // Get is a convenience function for creating iterator and calling Get.

mapper.go

@@ -5,40 +5,11 @@
 package gocqlx
 
 import (
-	"fmt"
-	"unicode"
-
-	"github.com/scylladb/gocqlx/reflectx"
+	"github.com/scylladb/go-reflectx"
 )
 
 // DefaultMapper uses `db` tag and automatically converts struct field names to
 // snake case. It can be set to whatever you want, but it is encouraged to be
 // set before gocqlx is used as name-to-field mappings are cached after first
 // use on a type.
-var DefaultMapper = reflectx.NewMapperFunc("db", snakeCase)
-
-// snakeCase converts camel case to snake case.
-func snakeCase(s string) string {
-	buf := []byte(s)
-	out := make([]byte, 0, len(buf)+3)
-
-	l := len(buf)
-	for i := 0; i < l; i++ {
-		if !(allowedBindRune(buf[i]) || buf[i] == '_') {
-			panic(fmt.Sprint("not allowed name ", s))
-		}
-
-		b := rune(buf[i])
-
-		if unicode.IsUpper(b) {
-			if i > 0 && buf[i-1] != '_' && (unicode.IsLower(rune(buf[i-1])) || (i+1 < l && unicode.IsLower(rune(buf[i+1])))) {
-				out = append(out, '_')
-			}
-			b = unicode.ToLower(b)
-		}
-
-		out = append(out, byte(b))
-	}
-
-	return string(out)
-}
+var DefaultMapper = reflectx.NewMapperFunc("db", reflectx.CamelToSnakeASCII)

queryx.go

@@ -12,7 +12,7 @@ import (
 	"strconv"
 
 	"github.com/gocql/gocql"
-	"github.com/scylladb/gocqlx/reflectx"
+	"github.com/scylladb/go-reflectx"
 )
 
 // CompileNamedQuery translates query with named parameters in a form