Merge branch 'master' into introduce-reader-and-write-groutine-3

Author: shogo82148

CHANGELOG.md

@@ -162,7 +162,7 @@ New Features:
 
  - Enable microsecond resolution on TIME, DATETIME and TIMESTAMP (#249)
  - Support for returning table alias on Columns() (#289, #359, #382)
- - Placeholder interpolation, can be actived with the DSN parameter `interpolateParams=true` (#309, #318, #490)
+ - Placeholder interpolation, can be activated with the DSN parameter `interpolateParams=true` (#309, #318, #490)
  - Support for uint64 parameters with high bit set (#332, #345)
  - Cleartext authentication plugin support (#327)
  - Exported ParseDSN function and the Config struct (#403, #419, #429)
@@ -206,7 +206,7 @@ Changes:
  - Also exported the MySQLWarning type
  - mysqlConn.Close returns the first error encountered instead of ignoring all errors
  - writePacket() automatically writes the packet size to the header
- - readPacket() uses an iterative approach instead of the recursive approach to merge splitted packets
+ - readPacket() uses an iterative approach instead of the recursive approach to merge split packets
 
 New Features:
 
@@ -254,7 +254,7 @@ Bugfixes:
 
   - Fixed MySQL 4.1 support: MySQL 4.1 sends packets with lengths which differ from the specification
   - Convert to DB timezone when inserting `time.Time`
-  - Splitted packets (more than 16MB) are now merged correctly
+  - Split packets (more than 16MB) are now merged correctly
   - Fixed false positive `io.EOF` errors when the data was fully read
   - Avoid panics on reuse of closed connections
   - Fixed empty string producing false nil values

README.md

@@ -127,7 +127,7 @@ Passwords can consist of any character. Escaping is **not** necessary.
 
 #### Protocol
 See [net.Dial](https://golang.org/pkg/net/#Dial) for more information which networks are available.
-In general you should use an Unix domain socket if available and TCP otherwise for best performance.
+In general you should use a Unix domain socket if available and TCP otherwise for best performance.
 
 #### Address
 For TCP and UDP networks, addresses have the form `host[:port]`.

auth.go

@@ -338,7 +338,7 @@ func (mc *mysqlConn) handleAuthResult(oldAuthData []byte, plugin string) error {
 
 	switch plugin {
 
-	// https://insidemysql.com/preparing-your-community-connector-for-mysql-8-part-2-sha256/
+	// https://dev.mysql.com/blog-archive/preparing-your-community-connector-for-mysql-8-part-2-sha256/
 	case "caching_sha2_password":
 		switch len(authData) {
 		case 0:
@@ -376,7 +376,7 @@ func (mc *mysqlConn) handleAuthResult(oldAuthData []byte, plugin string) error {
 						}
 
 						if data[0] != iAuthMoreData {
-							return fmt.Errorf("unexpect resp from server for caching_sha2_password perform full authentication")
+							return fmt.Errorf("unexpected resp from server for caching_sha2_password, perform full authentication")
 						}
 
 						// parse public key

connector.go

@@ -38,13 +38,12 @@ func encodeConnectionAttributes(textAttributes string) string {
 
 	// user-defined connection attributes
 	for _, connAttr := range strings.Split(textAttributes, ",") {
-		attr := strings.SplitN(connAttr, ":", 2)
-		if len(attr) != 2 {
+		k, v, found := strings.Cut(connAttr, ":")
+		if !found {
 			continue
 		}
-		for _, v := range attr {
-			connAttrsBuf = appendLengthEncodedString(connAttrsBuf, v)
-		}
+		connAttrsBuf = appendLengthEncodedString(connAttrsBuf, k)
+		connAttrsBuf = appendLengthEncodedString(connAttrsBuf, v)
 	}
 
 	return string(connAttrsBuf)

driver_test.go

@@ -1199,7 +1199,7 @@ func TestLongData(t *testing.T) {
 				dbt.Fatalf("LONGBLOB: length in: %d, length out: %d", len(inS), len(out))
 			}
 			if rows.Next() {
-				dbt.Error("LONGBLOB: unexpexted row")
+				dbt.Error("LONGBLOB: unexpected row")
 			}
 		} else {
 			dbt.Fatalf("LONGBLOB: no data")
@@ -1218,7 +1218,7 @@ func TestLongData(t *testing.T) {
 				dbt.Fatalf("LONGBLOB: length in: %d, length out: %d", len(in), len(out))
 			}
 			if rows.Next() {
-				dbt.Error("LONGBLOB: unexpexted row")
+				dbt.Error("LONGBLOB: unexpected row")
 			}
 		} else {
 			if err = rows.Err(); err != nil {
@@ -1294,7 +1294,7 @@ func TestLoadData(t *testing.T) {
 			dbt.Fatalf("unexpected row count: got %d, want 0", count)
 		}
 
-		// Then fille File with data and try to load it
+		// Then fill File with data and try to load it
 		file.WriteString("1\ta string\n2\ta string containing a \\t\n3\ta string containing a \\n\n4\ta string containing both \\t\\n\n")
 		file.Close()
 		dbt.mustExec(fmt.Sprintf("LOAD DATA LOCAL INFILE %q INTO TABLE test", file.Name()))
@@ -1900,7 +1900,7 @@ func TestConcurrent(t *testing.T) {
 			}(i)
 		}
 
-		// wait until all conections are open
+		// wait until all connections are open
 		wg.Wait()
 
 		if fatalError != "" {
@@ -1949,7 +1949,7 @@ func TestCustomDial(t *testing.T) {
 		t.Skipf("MySQL server not running on %s", netAddr)
 	}
 
-	// our custom dial function which justs wraps net.Dial here
+	// our custom dial function which just wraps net.Dial here
 	RegisterDialContext("mydial", func(ctx context.Context, addr string) (net.Conn, error) {
 		var d net.Dialer
 		return d.DialContext(ctx, prot, addr)

dsn.go

@@ -390,13 +390,13 @@ func ParseDSN(dsn string) (cfg *Config, err error) {
 // Values must be url.QueryEscape'ed
 func parseDSNParams(cfg *Config, params string) (err error) {
 	for _, v := range strings.Split(params, "&") {
-		param := strings.SplitN(v, "=", 2)
-		if len(param) != 2 {
+		key, value, found := strings.Cut(v, "=")
+		if !found {
 			continue
 		}
 
 		// cfg params
-		switch value := param[1]; param[0] {
+		switch key {
 		// Disable INFILE allowlist / enable all files
 		case "allowAllFiles":
 			var isBool bool
@@ -577,7 +577,7 @@ func parseDSNParams(cfg *Config, params string) (err error) {
 				cfg.Params = make(map[string]string)
 			}
 
-			if cfg.Params[param[0]], err = url.QueryUnescape(value); err != nil {
+			if cfg.Params[key], err = url.QueryUnescape(value); err != nil {
 				return
 			}
 		}

dsn_test.go

@@ -132,7 +132,7 @@ func TestDSNReformat(t *testing.T) {
 			dsn2 := cfg1.FormatDSN()
 			if dsn2 != dsn1 {
 				// Just log
-				t.Logf("%d. %q reformated as %q", i, dsn1, dsn2)
+				t.Logf("%d. %q reformatted as %q", i, dsn1, dsn2)
 			}
 
 			cfg2, err := ParseDSN(dsn2)

packets.go

@@ -219,7 +219,7 @@ func (mc *mysqlConn) readHandshakePacket() (data []byte, plugin string, err erro
 		// reserved (all [00]) [10 bytes]
 		pos += 1 + 2 + 2 + 1 + 10
 
-		// second part of the password cipher [mininum 13 bytes],
+		// second part of the password cipher [minimum 13 bytes],
 		// where len=MAX(13, length of auth-plugin-data - 8)
 		//
 		// The web documentation is ambiguous about the length. However,
@@ -516,7 +516,7 @@ func (mc *mysqlConn) readAuthResult() ([]byte, string, error) {
 	}
 }
 
-// Returns error if Packet is not an 'Result OK'-Packet
+// Returns error if Packet is not a 'Result OK'-Packet
 func (mc *okHandler) readResultOK() error {
 	data, err := mc.conn().readPacket()
 	if err != nil {
@@ -625,7 +625,7 @@ func (mc *mysqlConn) resultUnchanged() *okHandler {
 // Both return an instance of type *okHandler.
 type okHandler mysqlConn
 
-// Exposees the underlying type's methods.
+// Exposes the underlying type's methods.
 func (mc *okHandler) conn() *mysqlConn {
 	return (*mysqlConn)(mc)
 }

packets_test.go

@@ -186,9 +186,9 @@ var _ net.Conn = new(mockConn)
 // 	data[4] = 0x11
 // 	data[maxPacketSize+3] = 0x22
 
-// 	// 2nd packet has payload length 0 and squence id 1
-// 	// 00 00 00 01
-// 	data[pkt2ofs+3] = 0x01
+// // 2nd packet has payload length 0 and sequence id 1
+// // 00 00 00 01
+// data[pkt2ofs+3] = 0x01
 
 // 	conn.data = data
 // 	conn.maxReads = 3
@@ -218,9 +218,15 @@ var _ net.Conn = new(mockConn)
 // 	data[pkt2ofs+4] = 0x33
 // 	data[pkt2ofs+maxPacketSize+3] = 0x44
 
+<<<<<<< HEAD
 // 	// 3rd packet has payload length 0 and squence id 2
 // 	// 00 00 00 02
 // 	data[pkt3ofs+3] = 0x02
+=======
+	// 3rd packet has payload length 0 and sequence id 2
+	// 00 00 00 02
+	data[pkt3ofs+3] = 0x02
+>>>>>>> master
 
 // 	conn.data = data
 // 	conn.reads = 0