From 9b5128d7f6ff6d5ce43b54edac8c573440174218 Mon Sep 17 00:00:00 2001
From: 3AceShowHand <jinl1037@hotmail.com>
Date: Tue, 21 Nov 2023 18:12:58 +0800
Subject: [PATCH] fix all unit test.

---
 pkg/sink/codec/canal/canal_json_message.go | 15 ++-------------
 pkg/sink/codec/utils/field_types.go        | 18 ++++++++++++++++--
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkg/sink/codec/canal/canal_json_message.go b/pkg/sink/codec/canal/canal_json_message.go
index 64bb02aec30..566ac88495d 100644
--- a/pkg/sink/codec/canal/canal_json_message.go
+++ b/pkg/sink/codec/canal/canal_json_message.go
@@ -21,9 +21,9 @@ import (
 	"github.com/pingcap/log"
 	timodel "github.com/pingcap/tidb/parser/model"
 	"github.com/pingcap/tidb/parser/mysql"
-	"github.com/pingcap/tidb/parser/types"
 	"github.com/pingcap/tiflow/cdc/model"
 	cerrors "github.com/pingcap/tiflow/pkg/errors"
+	"github.com/pingcap/tiflow/pkg/sink/codec/utils"
 	canal "github.com/pingcap/tiflow/proto/canal"
 	"go.uber.org/zap"
 	"golang.org/x/text/encoding/charmap"
@@ -213,19 +213,8 @@ func canalJSONColumnMap2RowChangeColumns(cols map[string]interface{}, mysqlType
 	return result, nil
 }
 
-func extractBasicMySQLType(mysqlType string) string {
-	for i := 0; i < len(mysqlType); i++ {
-		if mysqlType[i] == '(' || mysqlType[i] == ' ' {
-			return mysqlType[:i]
-		}
-	}
-	return mysqlType
-}
-
 func canalJSONFormatColumn(value interface{}, name string, mysqlTypeStr string) *model.Column {
-	mysqlTypeStr = extractBasicMySQLType(mysqlTypeStr)
-	mysqlType := types.StrToType(mysqlTypeStr)
-
+	mysqlType := utils.ExtractBasicMySQLType(mysqlTypeStr)
 	result := &model.Column{
 		Type:  mysqlType,
 		Name:  name,
diff --git a/pkg/sink/codec/utils/field_types.go b/pkg/sink/codec/utils/field_types.go
index 6904d0d84cb..d327b4b5fcf 100644
--- a/pkg/sink/codec/utils/field_types.go
+++ b/pkg/sink/codec/utils/field_types.go
@@ -16,15 +16,18 @@ package utils
 import (
 	"strings"
 
+	"github.com/pingcap/tidb/parser/charset"
 	timodel "github.com/pingcap/tidb/parser/model"
 	"github.com/pingcap/tidb/parser/mysql"
-	"github.com/pingcap/tidb/types"
+	"github.com/pingcap/tidb/parser/types"
 	"github.com/pingcap/tiflow/cdc/model"
 )
 
 // SetBinChsClnFlag set the binary charset flag.
 func SetBinChsClnFlag(ft *types.FieldType) *types.FieldType {
-	types.SetBinChsClnFlag(ft)
+	ft.SetCharset(charset.CharsetBin)
+	ft.SetCollate(charset.CollationBin)
+	ft.AddFlag(mysql.BinaryFlag)
 	return ft
 }
 
@@ -66,3 +69,14 @@ func GetMySQLType(columnInfo *timodel.ColumnInfo, fullType bool) string {
 	}
 	return columnInfo.GetTypeDesc()
 }
+
+// ExtractBasicMySQLType return the mysql type
+func ExtractBasicMySQLType(mysqlType string) byte {
+	for i := 0; i < len(mysqlType); i++ {
+		if mysqlType[i] == '(' || mysqlType[i] == ' ' {
+			return types.StrToType(mysqlType[:i])
+		}
+	}
+
+	return types.StrToType(mysqlType)
+}