Rename errors consistent to "err"

connection.go

@@ -46,19 +46,19 @@ type serverSettings struct {
 }
 
 // Handles parameters set in DSN
-func (mc *mysqlConn) handleParams() (e error) {
+func (mc *mysqlConn) handleParams() (err error) {
 	for param, val := range mc.cfg.params {
 		switch param {
 		// Charset
 		case "charset":
 			charsets := strings.Split(val, ",")
 			for _, charset := range charsets {
-				e = mc.exec("SET NAMES " + charset)
-				if e == nil {
+				err = mc.exec("SET NAMES " + charset)
+				if err == nil {
 					break
 				}
 			}
-			if e != nil {
+			if err != nil {
 				return
 			}
 
@@ -72,8 +72,8 @@ func (mc *mysqlConn) handleParams() (e error) {
 
 		// System Vars
 		default:
-			e = mc.exec("SET " + param + "=" + val + "")
-			if e != nil {
+			err = mc.exec("SET " + param + "=" + val + "")
+			if err != nil {
 				return
 			}
 		}
@@ -83,15 +83,15 @@ func (mc *mysqlConn) handleParams() (e error) {
 }
 
 func (mc *mysqlConn) Begin() (driver.Tx, error) {
-	e := mc.exec("START TRANSACTION")
-	if e != nil {
-		return nil, e
+	err := mc.exec("START TRANSACTION")
+	if err != nil {
+		return nil, err
 	}
 
-	return &mysqlTx{mc}, e
+	return &mysqlTx{mc}, err
 }
 
-func (mc *mysqlConn) Close() (e error) {
+func (mc *mysqlConn) Close() (err error) {
 	mc.writeCommandPacket(COM_QUIT)
 	mc.bufReader = nil
 	mc.netConn.Close()
@@ -101,9 +101,9 @@ func (mc *mysqlConn) Close() (e error) {
 
 func (mc *mysqlConn) Prepare(query string) (driver.Stmt, error) {
 	// Send command
-	e := mc.writeCommandPacket(COM_STMT_PREPARE, query)
-	if e != nil {
-		return nil, e
+	err := mc.writeCommandPacket(COM_STMT_PREPARE, query)
+	if err != nil {
+		return nil, err
 	}
 
 	stmt := mysqlStmt{new(stmtContent)}
@@ -111,26 +111,26 @@ func (mc *mysqlConn) Prepare(query string) (driver.Stmt, error) {
 
 	// Read Result
 	var columnCount uint16
-	columnCount, e = stmt.readPrepareResultPacket()
-	if e != nil {
-		return nil, e
+	columnCount, err = stmt.readPrepareResultPacket()
+	if err != nil {
+		return nil, err
 	}
 
 	if stmt.paramCount > 0 {
-		stmt.params, e = stmt.mc.readColumns(stmt.paramCount)
-		if e != nil {
-			return nil, e
+		stmt.params, err = stmt.mc.readColumns(stmt.paramCount)
+		if err != nil {
+			return nil, err
 		}
 	}
 
 	if columnCount > 0 {
-		_, e = stmt.mc.readUntilEOF()
-		if e != nil {
-			return nil, e
+		_, err = stmt.mc.readUntilEOF()
+		if err != nil {
+			return nil, err
 		}
 	}
 
-	return stmt, e
+	return stmt, err
 }
 
 func (mc *mysqlConn) Exec(query string, args []driver.Value) (driver.Result, error) {
@@ -141,40 +141,40 @@ func (mc *mysqlConn) Exec(query string, args []driver.Value) (driver.Result, err
 	mc.affectedRows = 0
 	mc.insertId = 0
 
-	e := mc.exec(query)
-	if e != nil {
-		return nil, e
+	err := mc.exec(query)
+	if err != nil {
+		return nil, err
 	}
 
 	return &mysqlResult{
 			affectedRows: int64(mc.affectedRows),
 			insertId:     int64(mc.insertId)},
-		e
+		err
 }
 
 // Internal function to execute commands
-func (mc *mysqlConn) exec(query string) (e error) {
+func (mc *mysqlConn) exec(query string) (err error) {
 	// Send command
-	e = mc.writeCommandPacket(COM_QUERY, query)
-	if e != nil {
+	err = mc.writeCommandPacket(COM_QUERY, query)
+	if err != nil {
 		return
 	}
 
 	// Read Result
 	var resLen int
-	resLen, e = mc.readResultSetHeaderPacket()
-	if e != nil {
+	resLen, err = mc.readResultSetHeaderPacket()
+	if err != nil {
 		return
 	}
 
 	if resLen > 0 {
-		_, e = mc.readUntilEOF()
-		if e != nil {
+		_, err = mc.readUntilEOF()
+		if err != nil {
 			return
 		}
 
-		mc.affectedRows, e = mc.readUntilEOF()
-		if e != nil {
+		mc.affectedRows, err = mc.readUntilEOF()
+		if err != nil {
 			return
 		}
 	}
@@ -188,27 +188,27 @@ func (mc *mysqlConn) Query(query string, args []driver.Value) (driver.Rows, erro
 	}
 
 	// Send command
-	e := mc.writeCommandPacket(COM_QUERY, query)
-	if e != nil {
-		return nil, e
+	err := mc.writeCommandPacket(COM_QUERY, query)
+	if err != nil {
+		return nil, err
 	}
 
 	// Read Result
 	var resLen int
-	resLen, e = mc.readResultSetHeaderPacket()
-	if e != nil {
-		return nil, e
+	resLen, err = mc.readResultSetHeaderPacket()
+	if err != nil {
+		return nil, err
 	}
 
 	rows := mysqlRows{&rowsContent{mc, false, nil, false}}
 
 	if resLen > 0 {
 		// Columns
-		rows.content.columns, e = mc.readColumns(resLen)
-		if e != nil {
-			return nil, e
+		rows.content.columns, err = mc.readColumns(resLen)
+		if err != nil {
+			return nil, err
 		}
 	}
 
-	return rows, e
+	return rows, err
 }

driver.go

@@ -1,6 +1,6 @@
 // Copyright 2012 Julien Schmidt. All rights reserved.
 // http://www.julienschmidt.com
-// 
+//
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -21,44 +21,44 @@ type mysqlDriver struct{}
 // See https://github.com/Go-SQL-Driver/MySQL#dsn-data-source-name for how
 // the DSN string is formated
 func (d *mysqlDriver) Open(dsn string) (driver.Conn, error) {
-	var e error
+	var err error
 
 	// New mysqlConn
 	mc := new(mysqlConn)
 	mc.cfg = parseDSN(dsn)
 
 	// Connect to Server
-	mc.netConn, e = net.Dial(mc.cfg.net, mc.cfg.addr)
-	if e != nil {
-		return nil, e
+	mc.netConn, err = net.Dial(mc.cfg.net, mc.cfg.addr)
+	if err != nil {
+		return nil, err
 	}
 	mc.bufReader = bufio.NewReader(mc.netConn)
 
-	// Reading Handshake Initialization Packet 
-	e = mc.readInitPacket()
-	if e != nil {
-		return nil, e
+	// Reading Handshake Initialization Packet
+	err = mc.readInitPacket()
+	if err != nil {
+		return nil, err
 	}
 
 	// Send Client Authentication Packet
-	e = mc.writeAuthPacket()
-	if e != nil {
-		return nil, e
+	err = mc.writeAuthPacket()
+	if err != nil {
+		return nil, err
 	}
 
 	// Read Result Packet
-	e = mc.readResultOK()
-	if e != nil {
-		return nil, e
+	err = mc.readResultOK()
+	if err != nil {
+		return nil, err
 	}
 
 	// Handle DSN Params
-	e = mc.handleParams()
-	if e != nil {
-		return nil, e
+	err = mc.handleParams()
+	if err != nil {
+		return nil, err
 	}
 
-	return mc, e
+	return mc, err
 }
 
 func init() {

packets.go

@@ -24,47 +24,47 @@ import (
 // Read packet to buffer 'data'
 func (mc *mysqlConn) readPacket() ([]byte, error) {
 	// Packet Length
-	pktLen, e := mc.readNumber(3)
-	if e != nil {
-		return nil, e
+	pktLen, err := mc.readNumber(3)
+	if err != nil {
+		return nil, err
 	}
 
 	if int(pktLen) == 0 {
-		return nil, e
+		return nil, err
 	}
 
 	// Packet Number
-	pktSeq, e := mc.readNumber(1)
-	if e != nil {
-		return nil, e
+	pktSeq, err := mc.readNumber(1)
+	if err != nil {
+		return nil, err
 	}
 
 	// Check Packet Sync
 	if uint8(pktSeq) != mc.sequence {
 		if uint8(pktSeq) > mc.sequence {
-			e = errors.New("Commands out of sync. Did you run multiple statements at once?")
+			err = errors.New("Commands out of sync. Did you run multiple statements at once?")
 		} else {
-			e = errors.New("Commands out of sync; you can't run this command now")
+			err = errors.New("Commands out of sync; you can't run this command now")
 		}
-		return nil, e
+		return nil, err
 	}
 	mc.sequence++
 
 	// Read rest of packet
 	data := make([]byte, pktLen)
 	var n, add int
-	for e == nil && n < int(pktLen) {
-		add, e = mc.bufReader.Read(data[n:])
+	for err == nil && n < int(pktLen) {
+		add, err = mc.bufReader.Read(data[n:])
 		n += add
 	}
-	if e != nil || n < int(pktLen) {
-		if e == nil {
-			e = fmt.Errorf("Length of read data (%d) does not match body length (%d)", n, pktLen)
+	if err != nil || n < int(pktLen) {
+		if err == nil {
+			err = fmt.Errorf("Length of read data (%d) does not match body length (%d)", n, pktLen)
 		}
-		errLog.Print(`packets:60 `, e)
+		errLog.Print(`packets:64 `, err)
 		return nil, driver.ErrBadConn
 	}
-	return data, e
+	return data, err
 }
 
 // Read n bytes long number num
@@ -72,16 +72,16 @@ func (mc *mysqlConn) readNumber(nr uint8) (uint64, error) {
 	// Read bytes into array
 	buf := make([]byte, nr)
 	var n, add int
-	var e error
-	for e == nil && n < int(nr) {
-		add, e = mc.bufReader.Read(buf[n:])
+	var err error
+	for err == nil && n < int(nr) {
+		add, err = mc.bufReader.Read(buf[n:])
 		n += add
 	}
-	if e != nil || n < int(nr) {
-		if e == nil {
-			e = fmt.Errorf("Length of read data (%d) does not match header length (%d)", n, nr)
+	if err != nil || n < int(nr) {
+		if err == nil {
+			err = fmt.Errorf("Length of read data (%d) does not match header length (%d)", n, nr)
 		}
-		errLog.Print(`packets:80 `, e)
+		errLog.Print(`packets:84 `, err)
 		return 0, driver.ErrBadConn
 	}
 
@@ -90,17 +90,17 @@ func (mc *mysqlConn) readNumber(nr uint8) (uint64, error) {
 	for i := uint8(0); i < nr; i++ {
 		num |= uint64(buf[i]) << (i * 8)
 	}
-	return num, e
+	return num, err
 }
 
 func (mc *mysqlConn) writePacket(data *[]byte) error {
 	// Write packet
-	n, e := mc.netConn.Write(*data)
-	if e != nil || n != len(*data) {
-		if e == nil {
-			e = errors.New("Length of send data does not match packet length")
+	n, err := mc.netConn.Write(*data)
+	if err != nil || n != len(*data) {
+		if err == nil {
+			err = errors.New("Length of send data does not match packet length")
 		}
-		errLog.Print(`packets:103 `, e)
+		errLog.Print(`packets:103 `, err)
 		return driver.ErrBadConn
 	}
 
@@ -129,9 +129,9 @@ func (mc *mysqlConn) writePacket(data *[]byte) error {
  n                            rest of the plugin provided data (at least 12 bytes)
  1                            \0 byte, terminating the second part of a scramble
 */
-func (mc *mysqlConn) readInitPacket() (e error) {
-	data, e := mc.readPacket()
-	if e != nil {
+func (mc *mysqlConn) readInitPacket() (err error) {
+	data, err := mc.readPacket()
+	if err != nil {
 		return
 	}
 
@@ -143,7 +143,7 @@ func (mc *mysqlConn) readInitPacket() (e error) {
 	// Protocol version [8 bit uint]
 	mc.server.protocol = data[pos]
 	if mc.server.protocol < MIN_PROTOCOL_VERSION {
-		e = fmt.Errorf(
+		err = fmt.Errorf(
 			"Unsupported MySQL Protocol Version %d. Protocol Version %d or higher is required",
 			mc.server.protocol,
 			MIN_PROTOCOL_VERSION)
@@ -170,7 +170,7 @@ func (mc *mysqlConn) readInitPacket() (e error) {
 	// Server capabilities [16 bit uint]
 	mc.server.flags = ClientFlag(bytesToUint16(data[pos : pos+2]))
 	if mc.server.flags&CLIENT_PROTOCOL_41 == 0 {
-		e = errors.New("MySQL-Server does not support required Protocol 41+")
+		err = errors.New("MySQL-Server does not support required Protocol 41+")
 	}
 	pos += 2
 
@@ -197,7 +197,7 @@ n (Null-Terminated String)   user
 n (Length Coded Binary)      scramble_buff (1 + x bytes)
 n (Null-Terminated String)   databasename (optional)
 */
-func (mc *mysqlConn) writeAuthPacket() (e error) {
+func (mc *mysqlConn) writeAuthPacket() error {
 	// Adjust client flags based on server support
 	clientFlags := uint32(CLIENT_MULTI_STATEMENTS |
 		// CLIENT_MULTI_RESULTS |
@@ -274,7 +274,7 @@ Bytes                        Name
 1                            command
 n                            arg
 */
-func (mc *mysqlConn) writeCommandPacket(command commandType, args ...interface{}) (e error) {
+func (mc *mysqlConn) writeCommandPacket(command commandType, args ...interface{}) error {
 	// Reset Packet Sequence
 	mc.sequence = 0
 
@@ -329,9 +329,9 @@ func (mc *mysqlConn) writeCommandPacket(command commandType, args ...interface{}
 ******************************************************************************/
 
 // Returns error if Packet is not an 'Result OK'-Packet
-func (mc *mysqlConn) readResultOK() (e error) {
-	data, e := mc.readPacket()
-	if e != nil {
+func (mc *mysqlConn) readResultOK() (err error) {
+	data, err := mc.readPacket()
+	if err != nil {
 		return
 	}
 
@@ -341,13 +341,13 @@ func (mc *mysqlConn) readResultOK() (e error) {
 		return mc.handleOkPacket(data)
 	// EOF, someone is using old_passwords
 	case 254:
-		e = errors.New("It seems like you are using old_passwords, which is unsupported. See https://github.com/Go-SQL-Driver/MySQL/wiki/old_passwords")
+		err = errors.New("It seems like you are using old_passwords, which is unsupported. See https://github.com/Go-SQL-Driver/MySQL/wiki/old_passwords")
 		return
 	// ERROR
 	case 255:
 		return mc.handleErrorPacket(data)
 	default:
-		e = errors.New("Invalid Result Packet-Type")
+		err = errors.New("Invalid Result Packet-Type")
 		return
 	}
 
@@ -363,9 +363,9 @@ Bytes                       Name
 5                           sqlstate (5 characters)
 n                           message
 */
-func (mc *mysqlConn) handleErrorPacket(data []byte) (e error) {
+func (mc *mysqlConn) handleErrorPacket(data []byte) (err error) {
 	if data[0] != 255 {
-		e = errors.New("Wrong Packet-Type: Not an Error-Packet")
+		err = errors.New("Wrong Packet-Type: Not an Error-Packet")
 		return
 	}
 
@@ -382,7 +382,7 @@ func (mc *mysqlConn) handleErrorPacket(data []byte) (e error) {
 	// Error Message [string]
 	message := string(data[pos:])
 
-	e = fmt.Errorf("Error %d: %s", errno, message)
+	err = fmt.Errorf("Error %d: %s", errno, message)
 	return
 }
 
@@ -396,9 +396,9 @@ Bytes                       Name
 2                           warning_count
 n   (until end of packet)   message
 */
-func (mc *mysqlConn) handleOkPacket(data []byte) (e error) {
+func (mc *mysqlConn) handleOkPacket(data []byte) (err error) {
 	if data[0] != 0 {
-		e = errors.New("Wrong Packet-Type: Not an OK-Packet")
+		err = errors.New("Wrong Packet-Type: Not an OK-Packet")
 		return
 	}
 
@@ -406,15 +406,15 @@ func (mc *mysqlConn) handleOkPacket(data []byte) (e error) {
 	pos := 1
 
 	// Affected rows [Length Coded Binary]
-	affectedRows, n, e := bytesToLengthCodedBinary(data[pos:])
-	if e != nil {
+	affectedRows, n, err := bytesToLengthCodedBinary(data[pos:])
+	if err != nil {
 		return
 	}
 	pos += n
 
 	// Insert id [Length Coded Binary]
-	insertID, n, e := bytesToLengthCodedBinary(data[pos:])
-	if e != nil {
+	insertID, n, err := bytesToLengthCodedBinary(data[pos:])
+	if err != nil {
 		return
 	}
 
@@ -439,25 +439,25 @@ The order of packets for a result set is:
   (Row Data Packets)          row contents
   (EOF Packet)                marker: end of Data Packets
 */
-func (mc *mysqlConn) readResultSetHeaderPacket() (fieldCount int, e error) {
-	data, e := mc.readPacket()
-	if e != nil {
-		errLog.Print(`packets:446 `, e)
-		e = driver.ErrBadConn
+func (mc *mysqlConn) readResultSetHeaderPacket() (fieldCount int, err error) {
+	data, err := mc.readPacket()
+	if err != nil {
+		errLog.Print(`packets:446 `, err)
+		err = driver.ErrBadConn
 		return
 	}
 
 	if data[0] == 255 {
-		e = mc.handleErrorPacket(data)
+		err = mc.handleErrorPacket(data)
 		return
 	} else if data[0] == 0 {
-		e = mc.handleOkPacket(data)
+		err = mc.handleOkPacket(data)
 		return
 	}
 
-	num, n, e := bytesToLengthCodedBinary(data)
-	if e != nil || (n-len(data)) != 0 {
-		e = errors.New("Malformed Packet")
+	num, n, err := bytesToLengthCodedBinary(data)
+	if err != nil || (n-len(data)) != 0 {
+		err = errors.New("Malformed Packet")
 		return
 	}
 
@@ -466,19 +466,19 @@ func (mc *mysqlConn) readResultSetHeaderPacket() (fieldCount int, e error) {
 }
 
 // Read Packets as Field Packets until EOF-Packet or an Error appears
-func (mc *mysqlConn) readColumns(n int) (columns []mysqlField, e error) {
+func (mc *mysqlConn) readColumns(n int) (columns []mysqlField, err error) {
 	var data []byte
 
 	for {
-		data, e = mc.readPacket()
-		if e != nil {
+		data, err = mc.readPacket()
+		if err != nil {
 			return
 		}
 
 		// EOF Packet
 		if data[0] == 254 && len(data) == 5 {
 			if len(columns) != n {
-				e = fmt.Errorf("ColumnsCount mismatch n:%d len:%d", n, len(columns))
+				err = fmt.Errorf("ColumnsCount mismatch n:%d len:%d", n, len(columns))
 			}
 			return
 		}
@@ -489,48 +489,48 @@ func (mc *mysqlConn) readColumns(n int) (columns []mysqlField, e error) {
 		//var defaultVal uint64
 
 		// Catalog
-		//catalog, n, _, e = readLengthCodedBinary(data)
-		n, e = readAndDropLengthCodedBinary(data)
-		if e != nil {
+		//catalog, n, _, err = readLengthCodedBinary(data)
+		n, err = readAndDropLengthCodedBinary(data)
+		if err != nil {
 			return
 		}
 		pos += n
 
 		// Database [len coded string]
-		//database, n, _, e = readLengthCodedBinary(data[pos:])
-		n, e = readAndDropLengthCodedBinary(data[pos:])
-		if e != nil {
+		//database, n, _, err = readLengthCodedBinary(data[pos:])
+		n, err = readAndDropLengthCodedBinary(data[pos:])
+		if err != nil {
 			return
 		}
 		pos += n
 
 		// Table [len coded string]
-		//table, n, _, e = readLengthCodedBinary(data[pos:])
-		n, e = readAndDropLengthCodedBinary(data[pos:])
-		if e != nil {
+		//table, n, _, err = readLengthCodedBinary(data[pos:])
+		n, err = readAndDropLengthCodedBinary(data[pos:])
+		if err != nil {
 			return
 		}
 		pos += n
 
 		// Original table [len coded string]
-		//orgTable, n, _, e = readLengthCodedBinary(data[pos:])
-		n, e = readAndDropLengthCodedBinary(data[pos:])
-		if e != nil {
+		//orgTable, n, _, err = readLengthCodedBinary(data[pos:])
+		n, err = readAndDropLengthCodedBinary(data[pos:])
+		if err != nil {
 			return
 		}
 		pos += n
 
 		// Name [len coded string]
-		name, n, _, e = readLengthCodedBinary(data[pos:])
-		if e != nil {
+		name, n, _, err = readLengthCodedBinary(data[pos:])
+		if err != nil {
 			return
 		}
 		pos += n
 
 		// Original name [len coded string]
-		//orgName, n, _, e = readLengthCodedBinary(data[pos:])
-		n, e = readAndDropLengthCodedBinary(data[pos:])
-		if e != nil {
+		//orgName, n, _, err = readLengthCodedBinary(data[pos:])
+		n, err = readAndDropLengthCodedBinary(data[pos:])
+		if err != nil {
 			return
 		}
 		pos += n
@@ -560,7 +560,7 @@ func (mc *mysqlConn) readColumns(n int) (columns []mysqlField, e error) {
 
 		// Default value [len coded binary]
 		//if pos < len(data) {
-		//	defaultVal, _, e = bytesToLengthCodedBinary(data[pos:])
+		//	defaultVal, _, err = bytesToLengthCodedBinary(data[pos:])
 		//}
 
 		columns = append(columns, mysqlField{name: string(*name), fieldType: fieldType, flags: flags})
@@ -571,9 +571,9 @@ func (mc *mysqlConn) readColumns(n int) (columns []mysqlField, e error) {
 
 // Read Packets as Field Packets until EOF-Packet or an Error appears
 func (mc *mysqlConn) readRow(columnsCount int) (*[]*[]byte, error) {
-	data, e := mc.readPacket()
-	if e != nil {
-		return nil, e
+	data, err := mc.readPacket()
+	if err != nil {
+		return nil, err
 	}
 
 	// EOF Packet
@@ -589,9 +589,9 @@ func (mc *mysqlConn) readRow(columnsCount int) (*[]*[]byte, error) {
 
 	for i := 0; i < columnsCount; i++ {
 		// Read bytes and convert to string
-		row[i], n, isNull, e = readLengthCodedBinary(data[pos:])
-		if e != nil {
-			return nil, e
+		row[i], n, isNull, err = readLengthCodedBinary(data[pos:])
+		if err != nil {
+			return nil, err
 		}
 
 		// nil if field is NULL
@@ -606,12 +606,12 @@ func (mc *mysqlConn) readRow(columnsCount int) (*[]*[]byte, error) {
 }
 
 // Reads Packets Packets until EOF-Packet or an Error appears. Returns count of Packets read
-func (mc *mysqlConn) readUntilEOF() (count uint64, e error) {
+func (mc *mysqlConn) readUntilEOF() (count uint64, err error) {
 	var data []byte
 
 	for {
-		data, e = mc.readPacket()
-		if e != nil {
+		data, err = mc.readPacket()
+		if err != nil {
 			return
 		}
 
@@ -657,9 +657,9 @@ Prepare OK Packet
         (EOF packet)
 
 */
-func (stmt mysqlStmt) readPrepareResultPacket() (columnCount uint16, e error) {
-	data, e := stmt.mc.readPacket()
-	if e != nil {
+func (stmt mysqlStmt) readPrepareResultPacket() (columnCount uint16, err error) {
+	data, err := stmt.mc.readPacket()
+	if err != nil {
 		return
 	}
 
@@ -667,7 +667,7 @@ func (stmt mysqlStmt) readPrepareResultPacket() (columnCount uint16, e error) {
 	pos := 0
 
 	if data[pos] != 0 {
-		e = stmt.mc.handleErrorPacket(data)
+		err = stmt.mc.handleErrorPacket(data)
 		return
 	}
 	pos++
@@ -703,7 +703,7 @@ Bytes                Name
 n*2                  type of parameters
 n                    values for the parameters
 */
-func (stmt mysqlStmt) buildExecutePacket(args *[]driver.Value) (e error) {
+func (stmt mysqlStmt) buildExecutePacket(args *[]driver.Value) error {
 	argsLen := len(*args)
 	if argsLen < stmt.paramCount {
 		return fmt.Errorf(
@@ -838,9 +838,9 @@ func (stmt mysqlStmt) buildExecutePacket(args *[]driver.Value) (e error) {
 
 // http://dev.mysql.com/doc/internals/en/prepared-statements.html#packet-ProtocolBinary::ResultsetRow
 func (mc *mysqlConn) readBinaryRow(rc *rowsContent) (*[]*[]byte, error) {
-	data, e := mc.readPacket()
-	if e != nil {
-		return nil, e
+	data, err := mc.readPacket()
+	if err != nil {
+		return nil, err
 	}
 
 	pos := 0
@@ -928,10 +928,10 @@ func (mc *mysqlConn) readBinaryRow(rc *rowsContent) (*[]*[]byte, error) {
 			pos += 8
 
 		case FIELD_TYPE_DECIMAL, FIELD_TYPE_NEWDECIMAL:
-			row[i], n, isNull, e = readLengthCodedBinary(data[pos:])
+			row[i], n, isNull, err = readLengthCodedBinary(data[pos:])
 
-			if e != nil {
-				return nil, e
+			if err != nil {
+				return nil, err
 			}
 
 			if isNull && rc.columns[i].flags&FLAG_NOT_NULL == 0 {
@@ -944,9 +944,9 @@ func (mc *mysqlConn) readBinaryRow(rc *rowsContent) (*[]*[]byte, error) {
 			FIELD_TYPE_SET, FIELD_TYPE_TINY_BLOB, FIELD_TYPE_MEDIUM_BLOB,
 			FIELD_TYPE_LONG_BLOB, FIELD_TYPE_BLOB, FIELD_TYPE_VAR_STRING,
 			FIELD_TYPE_STRING, FIELD_TYPE_GEOMETRY:
-			row[i], n, isNull, e = readLengthCodedBinary(data[pos:])
-			if e != nil {
-				return nil, e
+			row[i], n, isNull, err = readLengthCodedBinary(data[pos:])
+			if err != nil {
+				return nil, err
 			}
 
 			if isNull && rc.columns[i].flags&FLAG_NOT_NULL == 0 {
@@ -957,9 +957,9 @@ func (mc *mysqlConn) readBinaryRow(rc *rowsContent) (*[]*[]byte, error) {
 		// Date YYYY-MM-DD
 		case FIELD_TYPE_DATE, FIELD_TYPE_NEWDATE:
 			var num uint64
-			num, n, e = bytesToLengthCodedBinary(data[pos:])
-			if e != nil {
-				return nil, e
+			num, n, err = bytesToLengthCodedBinary(data[pos:])
+			if err != nil {
+				return nil, err
 			}
 			pos += n
 
@@ -978,9 +978,9 @@ func (mc *mysqlConn) readBinaryRow(rc *rowsContent) (*[]*[]byte, error) {
 		// Time HH:MM:SS
 		case FIELD_TYPE_TIME:
 			var num uint64
-			num, n, e = bytesToLengthCodedBinary(data[pos:])
-			if e != nil {
-				return nil, e
+			num, n, err = bytesToLengthCodedBinary(data[pos:])
+			if err != nil {
+				return nil, err
 			}
 
 			var val []byte
@@ -998,9 +998,9 @@ func (mc *mysqlConn) readBinaryRow(rc *rowsContent) (*[]*[]byte, error) {
 		// Timestamp YYYY-MM-DD HH:MM:SS
 		case FIELD_TYPE_TIMESTAMP, FIELD_TYPE_DATETIME:
 			var num uint64
-			num, n, e = bytesToLengthCodedBinary(data[pos:])
-			if e != nil {
-				return nil, e
+			num, n, err = bytesToLengthCodedBinary(data[pos:])
+			if err != nil {
+				return nil, err
 			}
 			pos += n
 

rows.go

@@ -2,7 +2,7 @@
 //
 // Copyright 2012 Julien Schmidt. All rights reserved.
 // http://www.julienschmidt.com
-// 
+//
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -40,7 +40,7 @@ func (rows mysqlRows) Columns() (columns []string) {
 	return
 }
 
-func (rows mysqlRows) Close() (e error) {
+func (rows mysqlRows) Close() (err error) {
 	defer func() {
 		rows.content.mc = nil
 		rows.content = nil
@@ -52,8 +52,8 @@ func (rows mysqlRows) Close() (e error) {
 			return errors.New("Invalid Connection")
 		}
 
-		_, e = rows.content.mc.readUntilEOF()
-		if e != nil {
+		_, err = rows.content.mc.readUntilEOF()
+		if err != nil {
 			return
 		}
 	}
@@ -63,7 +63,7 @@ func (rows mysqlRows) Close() (e error) {
 
 // Next returns []driver.Value filled with either nil values for NULL entries
 // or []byte's for all other entries. Type conversion is done on rows.scan(),
-// when the dest type is know, which makes type conversion easier and avoids 
+// when the dest type is know, which makes type conversion easier and avoids
 // unnecessary conversions.
 func (rows mysqlRows) Next(dest []driver.Value) error {
 	if rows.content.eof {
@@ -78,18 +78,18 @@ func (rows mysqlRows) Next(dest []driver.Value) error {
 
 	// Fetch next row from stream
 	var row *[]*[]byte
-	var e error
+	var err error
 	if rows.content.binary {
-		row, e = rows.content.mc.readBinaryRow(rows.content)
+		row, err = rows.content.mc.readBinaryRow(rows.content)
 	} else {
-		row, e = rows.content.mc.readRow(columnsCount)
+		row, err = rows.content.mc.readRow(columnsCount)
 	}
 
-	if e != nil {
-		if e == io.EOF {
+	if err != nil {
+		if err == io.EOF {
 			rows.content.eof = true
 		}
-		return e
+		return err
 	}
 
 	for i := 0; i < columnsCount; i++ {

statement.go

@@ -25,8 +25,8 @@ type mysqlStmt struct {
 	*stmtContent
 }
 
-func (stmt mysqlStmt) Close() (e error) {
-	e = stmt.mc.writeCommandPacket(COM_STMT_CLOSE, stmt.id)
+func (stmt mysqlStmt) Close() (err error) {
+	err = stmt.mc.writeCommandPacket(COM_STMT_CLOSE, stmt.id)
 	stmt.mc = nil
 	return
 }
@@ -43,33 +43,33 @@ func (stmt mysqlStmt) Exec(args []driver.Value) (driver.Result, error) {
 	stmt.mc.insertId = 0
 
 	// Send command
-	e := stmt.buildExecutePacket(&args)
-	if e != nil {
-		return nil, e
+	err := stmt.buildExecutePacket(&args)
+	if err != nil {
+		return nil, err
 	}
 
 	// Read Result
 	var resLen int
-	resLen, e = stmt.mc.readResultSetHeaderPacket()
-	if e != nil {
-		return nil, e
+	resLen, err = stmt.mc.readResultSetHeaderPacket()
+	if err != nil {
+		return nil, err
 	}
 
 	if resLen > 0 {
 		// Columns
-		_, e = stmt.mc.readUntilEOF()
-		if e != nil {
-			return nil, e
+		_, err = stmt.mc.readUntilEOF()
+		if err != nil {
+			return nil, err
 		}
 
 		// Rows
-		stmt.mc.affectedRows, e = stmt.mc.readUntilEOF()
-		if e != nil {
-			return nil, e
+		stmt.mc.affectedRows, err = stmt.mc.readUntilEOF()
+		if err != nil {
+			return nil, err
 		}
 	}
-	if e != nil {
-		return nil, e
+	if err != nil {
+		return nil, err
 	}
 
 	return mysqlResult{
@@ -84,27 +84,27 @@ func (stmt mysqlStmt) Query(args []driver.Value) (driver.Rows, error) {
 	}
 
 	// Send command
-	e := stmt.buildExecutePacket(&args)
-	if e != nil {
-		return nil, e
+	err := stmt.buildExecutePacket(&args)
+	if err != nil {
+		return nil, err
 	}
 
 	// Read Result
 	var resLen int
-	resLen, e = stmt.mc.readResultSetHeaderPacket()
-	if e != nil {
-		return nil, e
+	resLen, err = stmt.mc.readResultSetHeaderPacket()
+	if err != nil {
+		return nil, err
 	}
 
 	rows := mysqlRows{&rowsContent{stmt.mc, true, nil, false}}
 
 	if resLen > 0 {
 		// Columns
-		rows.content.columns, e = stmt.mc.readColumns(resLen)
-		if e != nil {
-			return nil, e
+		rows.content.columns, err = stmt.mc.readColumns(resLen)
+		if err != nil {
+			return nil, err
 		}
 	}
 
-	return rows, e
+	return rows, err
 }

transaction.go

@@ -2,7 +2,7 @@
 //
 // Copyright 2012 Julien Schmidt. All rights reserved.
 // http://www.julienschmidt.com
-// 
+//
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -13,14 +13,14 @@ type mysqlTx struct {
 	mc *mysqlConn
 }
 
-func (tx *mysqlTx) Commit() (e error) {
-	e = tx.mc.exec("COMMIT")
+func (tx *mysqlTx) Commit() (err error) {
+	err = tx.mc.exec("COMMIT")
 	tx.mc = nil
 	return
 }
 
-func (tx *mysqlTx) Rollback() (e error) {
-	e = tx.mc.exec("ROLLBACK")
+func (tx *mysqlTx) Rollback() (err error) {
+	err = tx.mc.exec("ROLLBACK")
 	tx.mc = nil
 	return
 }

utils.go

@@ -2,7 +2,7 @@
 //
 // Copyright 2012 Julien Schmidt. All rights reserved.
 // http://www.julienschmidt.com
-// 
+//
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -121,22 +121,22 @@ func scramblePassword(scramble, password []byte) (result []byte) {
 ******************************************************************************/
 
 // Read a slice from the data slice
-func readSlice(data []byte, delim byte) (slice []byte, e error) {
+func readSlice(data []byte, delim byte) (slice []byte, err error) {
 	pos := bytes.IndexByte(data, delim)
 	if pos > -1 {
 		slice = data[:pos]
 	} else {
 		slice = data
-		e = io.EOF
+		err = io.EOF
 	}
 	return
 }
 
 func readLengthCodedBinary(data []byte) (*[]byte, int, bool, error) {
 	// Get length
-	num, n, e := bytesToLengthCodedBinary(data)
-	if e != nil {
-		return nil, n, true, e
+	num, n, err := bytesToLengthCodedBinary(data)
+	if err != nil {
+		return nil, n, true, err
 	}
 
 	// Check data length
@@ -155,19 +155,19 @@ func readLengthCodedBinary(data []byte) (*[]byte, int, bool, error) {
 	// Get bytes
 	b := data[n : n+int(num)]
 	n += int(num)
-	return &b, n, isNull, e
+	return &b, n, isNull, err
 }
 
-func readAndDropLengthCodedBinary(data []byte) (n int, e error) {
+func readAndDropLengthCodedBinary(data []byte) (n int, err error) {
 	// Get length
-	num, n, e := bytesToLengthCodedBinary(data)
-	if e != nil {
+	num, n, err := bytesToLengthCodedBinary(data)
+	if err != nil {
 		return
 	}
 
 	// Check data length
 	if len(data) < n+int(num) {
-		e = io.EOF
+		err = io.EOF
 		return
 	}
 
@@ -244,7 +244,7 @@ func float64ToBytes(f float64) []byte {
 	return uint64ToBytes(math.Float64bits(f))
 }
 
-func bytesToLengthCodedBinary(b []byte) (length uint64, n int, e error) {
+func bytesToLengthCodedBinary(b []byte) (length uint64, n int, err error) {
 	switch {
 
 	// 0-250: value of first byte
@@ -273,7 +273,7 @@ func bytesToLengthCodedBinary(b []byte) (length uint64, n int, e error) {
 	}
 
 	if len(b) < n {
-		e = io.EOF
+		err = io.EOF
 		return
 	}