ddl: enhance validation of column names when creating table

ddl/ddl_api.go

@@ -536,6 +536,16 @@ func checkTooManyColumns(colDefs []*ast.ColumnDef) error {
 	return nil
 }
 
+// checkContainDotColumns check field contains the table name.
+func checkContainDotColumns(tableName string, colDefs []*ast.ColumnDef) error {
+	for _, colDef := range colDefs {
+		if colDef.Name.Table.O != tableName && len(colDef.Name.Table.O) != 0 {
+			return ErrWrongTableName.GenByArgs(colDef.Name.Table.O)
+		}
+	}
+	return nil
+}
+
 func checkDuplicateConstraint(namesMap map[string]bool, name string, foreign bool) error {
 	if name == "" {
 		return nil
@@ -784,6 +794,10 @@ func (d *ddl) CreateTable(ctx sessionctx.Context, s *ast.CreateTableStmt) (err e
 		return errors.Trace(err)
 	}
 
+	if err = checkContainDotColumns(ident.Name.O, colDefs); err != nil {
+		return errors.Trace(err)
+	}
+
 	cols, newConstraints, err := buildColumnsAndConstraints(ctx, colDefs, s.Constraints)
 	if err != nil {
 		return errors.Trace(err)

ddl/ddl_db_test.go

@@ -162,6 +162,8 @@ func (s *testDBSuite) TestMySQLErrorCode(c *C) {
 	s.testErrorCode(c, sql, tmysql.ErrUnknownCharacterSet)
 	sql = "create table t1(a int) character set laitn1;"
 	s.testErrorCode(c, sql, tmysql.ErrUnknownCharacterSet)
+	sql = "create table t2(c1.c2 blob default null);"
+	s.testErrorCode(c, sql, tmysql.ErrWrongTableName)
 
 	// add column
 	sql = "alter table test_error_code_succ add column c1 int"

executor/executor_test.go

@@ -2515,6 +2515,15 @@ func (s *testSuite) TestIssue5341(c *C) {
 	tk.MustQuery("select * from test.t where a < 1 order by a limit 0;").Check(testkit.Rows())
 }
 
+func (s *testSuite) TestContainDotColumn(c *C) {
+	tk := testkit.NewTestKit(c, s.store)
+	tk.MustExec("use test")
+	tk.MustExec("drop table if exists test.t1")
+	tk.MustExec("create table test.t1(t1.a char)")
+	tk.MustExec("drop table if exists t2")
+	tk.MustExec("create table t2(a char, t2.b int)")
+}
+
 func (s *testSuite) TestCheckIndex(c *C) {
 	s.ctx = mock.NewContext()
 	s.ctx.Store = s.store