update: 优化alter table modify/change子句的关键字审核逻辑(#392)

session/session_inception.go

@@ -2727,6 +2727,7 @@ func (s *session) checkCreateTable(node *ast.CreateTableStmt, sql string) {
 				onUpdateDatetimeCount := 0
 
 				for _, field := range node.Cols {
+					s.checkKeyWords(field.Name.Name.O)
 					s.mysqlCheckField(table, field)
 					for _, op := range field.Options {
 						switch op.Tp {
@@ -3936,7 +3937,7 @@ func (s *session) mysqlCheckField(t *TableInfo, field *ast.ColumnDef) {
 		s.appendErrorNo(ErrFloatDoubleToDecimal, field.Name.Name)
 	}
 
-	s.checkKeyWords(field.Name.Name.O)
+	// s.checkKeyWords(field.Name.Name.O)
 
 	// notNullFlag := mysql.HasNotNullFlag(field.Tp.Flag)
 	// autoIncrement := mysql.HasAutoIncrementFlag(field.Tp.Flag)
@@ -4415,6 +4416,7 @@ func (s *session) checkAddColumn(t *TableInfo, c *ast.AlterTableSpec) {
 		if found {
 			s.appendErrorNo(ER_COLUMN_EXISTED, fmt.Sprintf("%s.%s", t.Name, nc.Name.Name))
 		} else {
+			s.checkKeyWords(nc.Name.Name.O)
 			s.mysqlCheckField(t, nc)
 
 			if !s.hasError() {

session/session_inception_test.go

@@ -1398,6 +1398,11 @@ func (s *testSessionIncSuite) TestAlterTableModifyColumn(c *C) {
 
 	sql = "alter table t1 modify c1 int not null;alter table t1 add primary key(id,c1);"
 	s.testErrorCode(c, sql)
+
+	config.GetGlobalConfig().Inc.EnableIdentiferKeyword = false
+	s.mustRunExec(c, "drop table if exists t1;create table t1(id int not null,`alter` int);")
+	sql = "alter table t1 modify `alter` bigint;"
+	s.testErrorCode(c, sql)
 }
 
 func (s *testSessionIncSuite) TestAlterTableChangeColumn(c *C) {
@@ -1417,6 +1422,13 @@ func (s *testSessionIncSuite) TestAlterTableChangeColumn(c *C) {
 
 	config.GetGlobalConfig().Inc.EnableChangeColumn = true
 
+	config.GetGlobalConfig().Inc.EnableIdentiferKeyword = false
+	s.mustRunExec(c, "drop table if exists t1;create table t1(id int not null,`alter` int);")
+	sql = "alter table t1 change `alter` `alter` bigint;"
+	s.testErrorCode(c, sql)
+	sql = "alter table t1 change `alter` `delete` bigint;"
+	s.testErrorCode(c, sql,
+		session.NewErr(session.ER_IDENT_USE_KEYWORD, "delete"))
 }
 
 func (s *testSessionIncSuite) TestAlterTableDropColumn(c *C) {