*: add statement prepare support and others

1. support statement prepare
2. support CHECKSUM/FULLTEXT syntax
3. remove sorter to use golang's slice sorter
4. move common from root to sqlparser/depends/common

Author: BohuTANG

driver/client.go

@@ -15,11 +15,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/xelabs/go-mysqlstack/common"
 	"github.com/xelabs/go-mysqlstack/packet"
 	"github.com/xelabs/go-mysqlstack/proto"
 	"github.com/xelabs/go-mysqlstack/sqldb"
 
+	"github.com/xelabs/go-mysqlstack/sqlparser/depends/common"
 	querypb "github.com/xelabs/go-mysqlstack/sqlparser/depends/query"
 	"github.com/xelabs/go-mysqlstack/sqlparser/depends/sqltypes"
 )
@@ -40,15 +40,11 @@ type Conn interface {
 
 	InitDB(db string) error
 	Command(command byte) error
-	// Query get the row cursor.
 	Query(sql string) (Rows, error)
 	Exec(sql string) error
-
-	// FetchAll fetchs all results.
 	FetchAll(sql string, maxrows int) (*sqltypes.Result, error)
-
-	// FetchAllWithFunc fetchs all results but the row cursor can be interrupted by the fn.
 	FetchAllWithFunc(sql string, maxrows int, fn Func) (*sqltypes.Result, error)
+	ComStatementPrepare(sql string) (*Statement, error)
 }
 
 type conn struct {
@@ -166,7 +162,12 @@ func NewConn(username, password, address, database, charset string) (Conn, error
 	return c, nil
 }
 
-func (c *conn) query(command byte, sql string) (Rows, error) {
+// NextPacket used to get the next packet
+func (c *conn) NextPacket() ([]byte, error) {
+	return c.packets.Next()
+}
+
+func (c *conn) baseQuery(mode RowMode, command byte, datas []byte) (Rows, error) {
 	var ok *proto.OK
 	var myerr, err error
 	var columns []*querypb.Field
@@ -180,7 +181,7 @@ func (c *conn) query(command byte, sql string) (Rows, error) {
 	}()
 
 	// Query.
-	if err = c.packets.WriteCommand(command, common.StringToBytes(sql)); err != nil {
+	if err = c.packets.WriteCommand(command, datas); err != nil {
 		return nil, err
 	}
 
@@ -205,33 +206,54 @@ func (c *conn) query(command byte, sql string) (Rows, error) {
 			}
 		}
 	}
-	rows := NewTextRows(c)
-	rows.rowsAffected = ok.AffectedRows
-	rows.insertID = ok.LastInsertID
-	rows.fields = columns
+	var rows Rows
+	switch mode {
+	case TextRowMode:
+		textRows := NewTextRows(c)
+		textRows.rowsAffected = ok.AffectedRows
+		textRows.insertID = ok.LastInsertID
+		textRows.fields = columns
+		rows = textRows
+	case BinaryRowMode:
+		binRows := NewBinaryRows(c)
+		binRows.rowsAffected = ok.AffectedRows
+		binRows.insertID = ok.LastInsertID
+		binRows.fields = columns
+		rows = binRows
+	}
 	return rows, nil
 }
 
+func (c *conn) comQuery(command byte, datas []byte) (Rows, error) {
+	return c.baseQuery(TextRowMode, command, datas)
+}
+
+func (c *conn) stmtQuery(command byte, datas []byte) (Rows, error) {
+	return c.baseQuery(BinaryRowMode, command, datas)
+}
+
 // ConnectionID is the connection id at greeting
 func (c *conn) ConnectionID() uint32 {
 	return c.greeting.ConnectionID
 }
 
 // Query execute the query and return the row iterator
 func (c *conn) Query(sql string) (Rows, error) {
-	return c.query(sqldb.COM_QUERY, sql)
+	return c.comQuery(sqldb.COM_QUERY, common.StringToBytes(sql))
 }
 
+// Ping -- ping command.
 func (c *conn) Ping() error {
-	rows, err := c.query(sqldb.COM_PING, "")
+	rows, err := c.comQuery(sqldb.COM_PING, []byte{})
 	if err != nil {
 		return err
 	}
 	return rows.Close()
 }
 
+// InitDB -- Init DB command.
 func (c *conn) InitDB(db string) error {
-	rows, err := c.query(sqldb.COM_INIT_DB, db)
+	rows, err := c.comQuery(sqldb.COM_INIT_DB, common.StringToBytes(db))
 	if err != nil {
 		return err
 	}
@@ -240,7 +262,7 @@ func (c *conn) InitDB(db string) error {
 
 // Exec executes the query and drain the results
 func (c *conn) Exec(sql string) error {
-	rows, err := c.query(sqldb.COM_QUERY, sql)
+	rows, err := c.comQuery(sqldb.COM_QUERY, common.StringToBytes(sql))
 	if err != nil {
 		return err
 	}
@@ -251,6 +273,7 @@ func (c *conn) Exec(sql string) error {
 	return nil
 }
 
+// FetchAll -- fetch all command.
 func (c *conn) FetchAll(sql string, maxrows int) (*sqltypes.Result, error) {
 	return c.FetchAllWithFunc(sql, maxrows, func(rows Rows) error { return nil })
 }
@@ -265,7 +288,7 @@ func (c *conn) FetchAllWithFunc(sql string, maxrows int, fn Func) (*sqltypes.Res
 	var qrRow []sqltypes.Value
 	var qrRows [][]sqltypes.Value
 
-	if iRows, err = c.query(sqldb.COM_QUERY, sql); err != nil {
+	if iRows, err = c.comQuery(sqldb.COM_QUERY, common.StringToBytes(sql)); err != nil {
 		return nil, err
 	}
 
@@ -307,13 +330,25 @@ func (c *conn) FetchAllWithFunc(sql string, maxrows int, fn Func) (*sqltypes.Res
 	return qr, err
 }
 
-// NextPacket used to get the next packet
-func (c *conn) NextPacket() ([]byte, error) {
-	return c.packets.Next()
+// ComStatementPrepare -- statement prepare command.
+func (c *conn) ComStatementPrepare(sql string) (*Statement, error) {
+	if err := c.packets.WriteCommand(sqldb.COM_STMT_PREPARE, common.StringToBytes(sql)); err != nil {
+		return nil, err
+	}
+	stmt, err := c.packets.ReadStatementPrepareResponse(c.greeting.Capability)
+	if err != nil {
+		return nil, err
+	}
+	return &Statement{
+		conn:        c,
+		ID:          stmt.ID,
+		ColumnNames: stmt.ColumnNames,
+	}, nil
 }
 
+// Command -- execute a command.
 func (c *conn) Command(command byte) error {
-	rows, err := c.query(command, "")
+	rows, err := c.comQuery(command, []byte{})
 	if err != nil {
 		return err
 	}
@@ -324,10 +359,12 @@ func (c *conn) Command(command byte) error {
 	return nil
 }
 
+// Quit -- quite command.
 func (c *conn) Quit() {
 	c.packets.WriteCommand(sqldb.COM_QUIT, nil)
 }
 
+// Cleanup -- cleanup connection.
 func (c *conn) Cleanup() {
 	if c.netConn != nil {
 		c.netConn.Close()

driver/client_test.go

@@ -14,10 +14,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/xelabs/go-mysqlstack/xlog"
 
 	querypb "github.com/xelabs/go-mysqlstack/sqlparser/depends/query"
 	"github.com/xelabs/go-mysqlstack/sqlparser/depends/sqltypes"
-	"github.com/xelabs/go-mysqlstack/xlog"
 )
 
 func TestClient(t *testing.T) {

driver/mock.go

@@ -19,8 +19,10 @@ import (
 	"time"
 
 	"github.com/xelabs/go-mysqlstack/sqldb"
-	"github.com/xelabs/go-mysqlstack/sqlparser/depends/sqltypes"
 	"github.com/xelabs/go-mysqlstack/xlog"
+
+	querypb "github.com/xelabs/go-mysqlstack/sqlparser/depends/query"
+	"github.com/xelabs/go-mysqlstack/sqlparser/depends/sqltypes"
 )
 
 func randomPort(min int, max int) int {
@@ -205,7 +207,7 @@ func (th *TestHandler) ComInitDB(s *Session, db string) error {
 }
 
 // ComQuery implements the interface.
-func (th *TestHandler) ComQuery(s *Session, query string, callback func(qr *sqltypes.Result) error) error {
+func (th *TestHandler) ComQuery(s *Session, query string, bindVariables map[string]*querypb.BindVariable, callback func(qr *sqltypes.Result) error) error {
 	log := th.log
 	query = strings.ToLower(query)
 
@@ -226,15 +228,13 @@ func (th *TestHandler) ComQuery(s *Session, query string, callback func(qr *sqlt
 			case <-time.After(time.Millisecond * time.Duration(cond.Delay)):
 				log.Debug("mock.handler.delay.done...")
 			}
-			callback(cond.Result)
-			return nil
+			return callback(cond.Result)
 		case COND_ERROR:
 			return cond.Error
 		case COND_PANIC:
 			log.Panic("mock.handler.panic....")
 		case COND_NORMAL:
-			callback(cond.Result)
-			return nil
+			return callback(cond.Result)
 		case COND_STREAM:
 			flds := cond.Result.Fields
 			// Send Fields for stream.
@@ -275,8 +275,7 @@ func (th *TestHandler) ComQuery(s *Session, query string, callback func(qr *sqlt
 			}
 			th.mu.Unlock()
 		}
-		callback(&sqltypes.Result{})
-		return nil
+		return callback(&sqltypes.Result{})
 	}
 
 	th.mu.Lock()
@@ -289,8 +288,7 @@ func (th *TestHandler) ComQuery(s *Session, query string, callback func(qr *sqlt
 	}
 	for _, pat := range th.patterns {
 		if pat.expr.MatchString(query) {
-			callback(pat.result)
-			return nil
+			return callback(pat.result)
 		}
 	}
 
@@ -302,8 +300,7 @@ func (th *TestHandler) ComQuery(s *Session, query string, callback func(qr *sqlt
 			idx = v.idx
 			v.idx++
 		}
-		callback(v.conds[idx].Result)
-		return nil
+		return callback(v.conds[idx].Result)
 	}
 	return fmt.Errorf("mock.handler.query[%v].error[can.not.found.the.cond.please.set.first]", query)
 }