internal/structfilter: fix build

.travis.yml

@@ -6,12 +6,13 @@ addons:
   postgresql: "9.6"
 
 go:
-  - 1.11.x
   - 1.12.x
+  - 1.13.x
   - tip
 
 matrix:
   allow_failures:
+    - go: 1.13.x
     - go: tip
 
 env:
@@ -21,4 +22,4 @@ go_import_path: github.com/go-pg/pg
 
 before_install:
   - psql -U postgres -c "CREATE EXTENSION hstore"
-  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.16.0
+  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.17.1

Makefile

@@ -3,7 +3,4 @@ all:
 	go test ./... -short -race
 	go test ./... -run=NONE -bench=. -benchmem
 	env GOOS=linux GOARCH=386 go test ./...
-	go vet ./...
-	go get github.com/gordonklaus/ineffassign
-	ineffassign .
 	golangci-lint run

internal/structfilter/field.go

@@ -80,12 +80,14 @@ func newField(sf reflect.StructField) *Field {
 	}
 
 	filterName := filterName(f.name)
+	const sep = "_"
+
 	if f.IsSlice {
-		f.Column, f.opCode, f.OpValue = splitSliceColumnOperator(filterName)
+		f.Column, f.opCode, f.OpValue = splitSliceColumnOperator(filterName, sep)
 		f.Scan = arrayScanner(sf.Type)
 		f.Append = types.ArrayAppender(sf.Type)
 	} else {
-		f.Column, f.opCode, f.OpValue = splitColumnOperator(filterName)
+		f.Column, f.opCode, f.OpValue = splitColumnOperator(filterName, sep)
 		f.Scan = scanner(sf.Type)
 		f.Append = types.Appender(sf.Type)
 	}
@@ -110,9 +112,7 @@ func (f *Field) Omit(value reflect.Value) bool {
 	return !f.required && f.noWhere || f.isZero(value)
 }
 
-func splitColumnOperator(s string) (string, opCode, string) {
-	const sep = "__"
-
+func splitColumnOperator(s, sep string) (string, opCode, string) {
 	ind := strings.Index(s, sep)
 	if ind == -1 {
 		return s, opCodeEq, opEq
@@ -143,9 +143,7 @@ func splitColumnOperator(s string) (string, opCode, string) {
 	}
 }
 
-func splitSliceColumnOperator(s string) (string, opCode, string) {
-	const sep = "__"
-
+func splitSliceColumnOperator(s, sep string) (string, opCode, string) {
 	ind := strings.Index(s, sep)
 	if ind == -1 {
 		return s, opCodeEq, opAny
@@ -166,6 +164,5 @@ func splitSliceColumnOperator(s string) (string, opCode, string) {
 
 func filterName(s string) string {
 	s = internal.Underscore(s)
-	s = strings.ReplaceAll(s, "_", "__")
 	return s
 }

internal/structfilter/struct.go

@@ -23,7 +23,7 @@ func NewStruct(typ reflect.Type) *Struct {
 }
 
 func (s *Struct) Field(name string) *Field {
-	col, opCode, _ := splitColumnOperator(name)
+	col, opCode, _ := splitColumnOperator(name, "__")
 	for _, f := range s.Fields {
 		if f.Column == col && f.opCode == opCode {
 			return f