Shenli/set password

mysqldef/const.go

@@ -115,3 +115,13 @@ const (
 const (
 	AuthName = "mysql_native_password"
 )
+
+// mysql database and tables
+const (
+	// MySQLDB is the name of mysql system database.
+	MySQLDB = "mysql"
+	// UserTable is the table in mysql db contains user info.
+	UserTable = "User"
+
+	CreateUserTable = "CREATE TABLE if not exists mysql.user (Host CHAR(64), User CHAR(16), Password CHAR(41), PRIMARY KEY (Host, User));"
+)

parser/parser.y

@@ -74,6 +74,7 @@ import (
 	any 		"ANY"
 	as		"AS"
 	asc		"ASC"
+	at		"AT"
 	autoIncrement	"AUTO_INCREMENT"
 	avg		"AVG"
 	begin		"BEGIN"
@@ -3009,13 +3010,17 @@ UserVariable:
 	}
 
 Username:
-	Identifier
+	stringLit "AT" stringLit	
 	{
-		$$ = $1.(string)
+		$$ = $1.(string) + "@" + $3.(string)
 	}
 
 PasswordOpt:
-	"PASSWORD" '(' AuthString ')' 
+	stringLit
+	{
+		$$ = $1.(string)
+	}
+|	"PASSWORD" '(' AuthString ')' 
 	{
 		$$ = $3.(string)
 	}

parser/parser_test.go

@@ -203,6 +203,9 @@ func (s *testParserSuite) TestParser0(c *C) {
 		// SET CHARACTER SET
 		{"SET CHARACTER SET utf8mb4;", true},
 		{"SET CHARACTER SET 'utf8mb4';", true},
+		// Set password
+		{"SET PASSWORD = 'password';", true},
+		{"SET PASSWORD FOR 'shenli'@'localhost' = 'password';", true},
 
 		// qualified select
 		{"SELECT a.b.c FROM t", true},

parser/scanner.l

@@ -489,6 +489,7 @@ sys_var		"@@"(({global}".")|({session}".")|{local}".")?{ident}
 ">>"			return rsh
 "<=>"			return nulleq
 
+"@"			return at
 "?"			return placeholder
 
 {abs}			lval.item = string(l.val)

stmt/stmts/create_test.go

@@ -21,6 +21,7 @@ import (
 	"github.com/ngaut/log"
 	. "github.com/pingcap/check"
 	"github.com/pingcap/tidb"
+	mysql "github.com/pingcap/tidb/mysqldef"
 )
 
 func TestT(t *testing.T) {
@@ -32,18 +33,20 @@ var _ = Suite(&testStmtSuite{})
 type testStmtSuite struct {
 	dbName string
 
-	testDB         *sql.DB
-	createDBSql    string
-	dropDBSql      string
-	useDBSql       string
-	createTableSql string
-	insertSql      string
-	selectSql      string
+	testDB                  *sql.DB
+	createDBSql             string
+	dropDBSql               string
+	useDBSql                string
+	createTableSql          string
+	insertSql               string
+	selectSql               string
+	createMySQLDBSQL        string
+	createMySQLUserTableSQL string
 }
 
 func (s *testStmtSuite) SetUpTest(c *C) {
 	log.SetLevelByString("error")
-	s.dbName = "test"
+	s.dbName = "teststmts"
 	var err error
 	s.testDB, err = sql.Open(tidb.DriverName, tidb.EngineGoLevelDBMemory+"/"+s.dbName+"/"+s.dbName)
 	c.Assert(err, IsNil)
@@ -59,6 +62,12 @@ func (s *testStmtSuite) SetUpTest(c *C) {
 	s.selectSql = `SELECT * from test limit 2;`
 	mustExec(c, s.testDB, s.createDBSql)
 	mustExec(c, s.testDB, s.useDBSql)
+
+	s.createMySQLDBSQL = fmt.Sprintf("create database if not exists %s;", mysql.MySQLDB)
+	s.createMySQLUserTableSQL = mysql.CreateUserTable
+
+	mustExec(c, s.testDB, s.createMySQLDBSQL)
+	mustExec(c, s.testDB, s.createMySQLUserTableSQL)
 }
 
 func (s *testStmtSuite) TearDownTest(c *C) {

stmt/stmts/set.go

@@ -22,9 +22,14 @@ import (
 	"github.com/pingcap/tidb/context"
 	"github.com/pingcap/tidb/expression"
 	"github.com/pingcap/tidb/expression/expressions"
+	"github.com/pingcap/tidb/model"
+	mysql "github.com/pingcap/tidb/mysqldef"
+	"github.com/pingcap/tidb/parser/opcode"
 	"github.com/pingcap/tidb/rset"
+	"github.com/pingcap/tidb/rset/rsets"
 	"github.com/pingcap/tidb/sessionctx/variable"
 	"github.com/pingcap/tidb/stmt"
+	"github.com/pingcap/tidb/table"
 	"github.com/pingcap/tidb/util/format"
 )
 
@@ -230,6 +235,30 @@ func (s *SetPwdStmt) SetText(text string) {
 
 // Exec implements the stmt.Statement Exec interface.
 func (s *SetPwdStmt) Exec(ctx context.Context) (_ rset.Recordset, err error) {
-	// TODO: finish this
-	return nil, nil
+	// If len(s.User) == 0, use CURRENT_USER()
+	strs := strings.Split(s.User, "@")
+	userName := strs[0]
+	host := strs[1]
+	// Update mysql.user
+	r := &rsets.JoinRset{
+		Left: &rsets.TableSource{
+			Source: table.Ident{
+				Name:   model.NewCIStr(mysql.UserTable),
+				Schema: model.NewCIStr(mysql.MySQLDB),
+			},
+		},
+	}
+	asgn := expressions.Assignment{
+		ColName: "Password",
+		Expr:    expressions.Value{Val: s.Password},
+	}
+	nameMatch := expressions.NewBinaryOperation(opcode.EQ, &expressions.Ident{CIStr: model.NewCIStr("User")}, &expressions.Value{Val: userName})
+	hostMatch := expressions.NewBinaryOperation(opcode.EQ, &expressions.Ident{CIStr: model.NewCIStr("Host")}, &expressions.Value{Val: host})
+	where := expressions.NewBinaryOperation(opcode.AndAnd, nameMatch, hostMatch)
+	st := &UpdateStmt{
+		TableRefs: r,
+		List:      []expressions.Assignment{asgn},
+		Where:     where,
+	}
+	return st.Exec(ctx)
 }

stmt/stmts/set_test.go

@@ -139,21 +139,29 @@ func (s *testStmtSuite) TestSetCharsetStmt(c *C) {
 }
 
 func (s *testStmtSuite) TestSetPwdStmt(c *C) {
-	// Mock SetPwdStmt.
-	testStmt := &stmts.SetPwdStmt{
-		User:     "user",
-		Password: "password",
-	}
-
-	testStmt.SetText(`SET PASSWORD FOR 'user' = PASSWORD('password');`)
+	tx := mustBegin(c, s.testDB)
+	tx.Query(`INSERT INTO mysql.User VALUES ("localhost", "root", ""), ("127.0.0.1", "root", "")`)
+	rows, err := tx.Query(`SELECT Password FROM mysql.User WHERE User="root" and Host="localhost"`)
+	c.Assert(err, IsNil)
+	rows.Next()
+	var pwd string
+	rows.Scan(&pwd)
+	c.Assert(pwd, Equals, "")
+	c.Assert(rows.Next(), IsFalse)
+	rows.Close()
+	mustCommit(c, tx)
 
-	c.Assert(testStmt.IsDDL(), IsFalse)
-	c.Assert(len(testStmt.OriginText()), Greater, 0)
+	tx = mustBegin(c, s.testDB)
+	tx.Query(`SET PASSWORD FOR 'root'@'localhost' = 'password';`)
+	mustCommit(c, tx)
 
-	_, err := testStmt.Exec(nil)
+	tx = mustBegin(c, s.testDB)
+	rows, err = tx.Query(`SELECT Password FROM mysql.User WHERE User="root" and Host="localhost"`)
 	c.Assert(err, IsNil)
-
-	mf := newMockFormatter()
-	testStmt.Explain(nil, mf)
-	c.Assert(mf.Len(), Greater, 0)
+	rows.Next()
+	rows.Scan(&pwd)
+	c.Assert(pwd, Equals, "password")
+	c.Assert(rows.Next(), IsFalse)
+	rows.Close()
+	mustCommit(c, tx)
 }