just pretty source code and upgrade go version to go1.18 as minimum support

alimy · alimy · commit 47611e0a338b · 2023-08-07T21:59:38.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,6 @@ _testmain.go
 *.exe
 tags
 environ
+
+.env
+.envrc
diff --git a/Makefile b/Makefile
@@ -0,0 +1,7 @@
+.PHONY: fmt
+fmt:
+	go fmt ./...
+
+.PHONY: test
+test:
+	go test ./...
diff --git a/bind.go b/bind.go
@@ -22,10 +22,10 @@ const (
 )
 
 var defaultBinds = map[int][]string{
-	DOLLAR:   []string{"postgres", "pgx", "pq-timeouts", "cloudsqlpostgres", "ql", "nrpostgres", "cockroach"},
-	QUESTION: []string{"mysql", "sqlite3", "nrmysql", "nrsqlite3"},
-	NAMED:    []string{"oci8", "ora", "goracle", "godror"},
-	AT:       []string{"sqlserver"},
+	DOLLAR:   {"postgres", "pgx", "pq-timeouts", "cloudsqlpostgres", "ql", "nrpostgres", "cockroach"},
+	QUESTION: {"mysql", "sqlite3", "nrmysql", "nrsqlite3"},
+	NAMED:    {"oci8", "ora", "goracle", "godror"},
+	AT:       {"sqlserver"},
 }
 
 var binds sync.Map
diff --git a/doc.go b/doc.go
@@ -8,5 +8,5 @@
 // Additions include scanning into structs, named query support, rebinding
 // queries for different drivers, convenient shorthands for common error handling
 // and more.
-//
+
 package sqlx
diff --git a/go.mod b/go.mod
@@ -1,9 +1,9 @@
 module github.com/jmoiron/sqlx
 
-go 1.10
+go 1.18
 
 require (
-	github.com/go-sql-driver/mysql v1.6.0
-	github.com/lib/pq v1.2.0
-	github.com/mattn/go-sqlite3 v1.14.6
+	github.com/go-sql-driver/mysql v1.7.1
+	github.com/lib/pq v1.10.9
+	github.com/mattn/go-sqlite3 v1.14.17
 )
diff --git a/go.sum b/go.sum
@@ -1,6 +1,6 @@
-github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
-github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
-github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg=
-github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
+github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
+github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
+github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
diff --git a/named.go b/named.go
@@ -10,7 +10,7 @@ package sqlx
 //
 //  * compileNamedQuery - rebind a named query, returning a query and list of names
 //  * bindArgs, bindMapArgs, bindAnyArgs - given a list of names, return an arglist
-//
+
 import (
 	"bytes"
 	"database/sql"
diff --git a/named_context.go b/named_context.go
@@ -1,5 +1,3 @@
-// +build go1.8
-
 package sqlx
 
 import (
diff --git a/named_context_test.go b/named_context_test.go
@@ -1,5 +1,3 @@
-// +build go1.8
-
 package sqlx
 
 import (
diff --git a/reflectx/reflect.go b/reflectx/reflect.go
@@ -3,7 +3,7 @@
 // allows for Go-compatible named attribute access, including accessing embedded
 // struct attributes and the ability to use  functions and struct tags to
 // customize field names.
-//
+
 package reflectx
 
 import (
diff --git a/sqlx.go b/sqlx.go
@@ -5,8 +5,8 @@ import (
 	"database/sql/driver"
 	"errors"
 	"fmt"
+	"os"
 
-	"io/ioutil"
 	"path/filepath"
 	"reflect"
 	"strings"
@@ -51,9 +51,9 @@ func mapper() *reflectx.Mapper {
 
 // isScannable takes the reflect.Type and the actual dest value and returns
 // whether or not it's Scannable.  Something is scannable if:
-//   * it is not a struct
-//   * it implements sql.Scanner
-//   * it has no exported fields
+//   - it is not a struct
+//   - it implements sql.Scanner
+//   - it has no exported fields
 func isScannable(t reflect.Type) bool {
 	if reflect.PtrTo(t).Implements(_scannerInterface) {
 		return true
@@ -706,7 +706,7 @@ func LoadFile(e Execer, path string) (*sql.Result, error) {
 	if err != nil {
 		return nil, err
 	}
-	contents, err := ioutil.ReadFile(realpath)
+	contents, err := os.ReadFile(realpath)
 	if err != nil {
 		return nil, err
 	}
@@ -884,9 +884,9 @@ func structOnlyError(t reflect.Type) error {
 // then each row must only have one column which can scan into that type.  This
 // allows you to do something like:
 //
-//    rows, _ := db.Query("select id from people;")
-//    var ids []int
-//    scanAll(rows, &ids, false)
+//	rows, _ := db.Query("select id from people;")
+//	var ids []int
+//	scanAll(rows, &ids, false)
 //
 // and ids will be a list of the id results.  I realize that this is a desirable
 // interface to expose to users, but for now it will only be exposed via changes
diff --git a/sqlx_context.go b/sqlx_context.go
@@ -1,12 +1,10 @@
-// +build go1.8
-
 package sqlx
 
 import (
 	"context"
 	"database/sql"
 	"fmt"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"reflect"
 )
@@ -99,7 +97,7 @@ func LoadFileContext(ctx context.Context, e ExecerContext, path string) (*sql.Re
 	if err != nil {
 		return nil, err
 	}
-	contents, err := ioutil.ReadFile(realpath)
+	contents, err := os.ReadFile(realpath)
 	if err != nil {
 		return nil, err
 	}
diff --git a/sqlx_context_test.go b/sqlx_context_test.go
@@ -1,15 +1,13 @@
-// +build go1.8
-
 // The following environment variables, if set, will be used:
 //
-//	* SQLX_SQLITE_DSN
-//	* SQLX_POSTGRES_DSN
-//	* SQLX_MYSQL_DSN
+//   - SQLX_SQLITE_DSN
+//   - SQLX_POSTGRES_DSN
+//   - SQLX_MYSQL_DSN
 //
 // Set any of these variables to 'skip' to skip them.  Note that for MySQL,
 // the string '?parseTime=True' will be appended to the DSN if it's not there
 // already.
-//
+
 package sqlx
 
 import (
diff --git a/sqlx_test.go b/sqlx_test.go
@@ -1,13 +1,13 @@
 // The following environment variables, if set, will be used:
 //
-//	* SQLX_SQLITE_DSN
-//	* SQLX_POSTGRES_DSN
-//	* SQLX_MYSQL_DSN
+//   - SQLX_SQLITE_DSN
+//   - SQLX_POSTGRES_DSN
+//   - SQLX_MYSQL_DSN
 //
 // Set any of these variables to 'skip' to skip them.  Note that for MySQL,
 // the string '?parseTime=True' will be appended to the DSN if it's not there
 // already.
-//
+
 package sqlx
 
 import (
diff --git a/types/types.go b/types/types.go
@@ -6,8 +6,7 @@ import (
 	"database/sql/driver"
 	"encoding/json"
 	"errors"
-
-	"io/ioutil"
+	"io"
 )
 
 // GzippedText is a []byte which transparently gzips data being submitted to
@@ -43,7 +42,7 @@ func (g *GzippedText) Scan(src interface{}) error {
 		return err
 	}
 	defer reader.Close()
-	b, err := ioutil.ReadAll(reader)
+	b, err := io.ReadAll(reader)
 	if err != nil {
 		return err
 	}

-Original file line number
+Diff line change
 *.exe
 tags
 environ
++
 +.env
 +.envrc
Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,10 @@ const (`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`var defaultBinds = map[int][]string{`
`25`		`- DOLLAR: []string{"postgres", "pgx", "pq-timeouts", "cloudsqlpostgres", "ql", "nrpostgres", "cockroach"},`
`26`		`- QUESTION: []string{"mysql", "sqlite3", "nrmysql", "nrsqlite3"},`
`27`		`- NAMED: []string{"oci8", "ora", "goracle", "godror"},`
`28`		`- AT: []string{"sqlserver"},`
	`25`	`+ DOLLAR: {"postgres", "pgx", "pq-timeouts", "cloudsqlpostgres", "ql", "nrpostgres", "cockroach"},`
	`26`	`+ QUESTION: {"mysql", "sqlite3", "nrmysql", "nrsqlite3"},`
	`27`	`+ NAMED: {"oci8", "ora", "goracle", "godror"},`
	`28`	`+ AT: {"sqlserver"},`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`var binds sync.Map`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build go1.8`
`2`		`-`
`3`	`1`	`package sqlx`
`4`	`2`
`5`	`3`	`import (`