feature: 添加json类型开关 (#26)

hanchuanchuan · May 6, 2019 · f225847 · f225847
1 parent c541033
commit f225847
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 88 deletions.
diff --git a/config/config.go b/config/config.go
@@ -299,6 +299,7 @@ type Inc struct {
 	EnableFingerprint      bool `toml:"enable_fingerprint" json:"enable_fingerprint"`
 	EnableForeignKey       bool `toml:"enable_foreign_key" json:"enable_foreign_key"`
 	EnableIdentiferKeyword bool `toml:"enable_identifer_keyword" json:"enable_identifer_keyword"`
+	EnableJsonType         bool `toml:"enable_json_type" json:"enable_json_type"`
 	EnableNotInnodb        bool `toml:"enable_not_innodb" json:"enable_not_innodb"`
 	EnableNullable         bool `toml:"enable_nullable" json:"enable_nullable"` // 允许空列
 	EnableOrderByRand      bool `toml:"enable_orderby_rand" json:"enable_orderby_rand"`
@@ -339,7 +340,7 @@ type Inc struct {
 	SupportCollation string `toml:"support_collation" json:"support_collation"`
 	// Version *string
 
-	EnableNullIndexName  bool `toml:"enable_null_index_name" json:"enable_null_index_name"` //是否允许不指定索引名
+	EnableNullIndexName bool `toml:"enable_null_index_name" json:"enable_null_index_name"` //是否允许不指定索引名
 }
 
 // Osc online schema change 工具参数配置

diff --git a/session/errors.go b/session/errors.go
@@ -190,8 +190,9 @@ const (
 	ErrCharsetNotSupport
 	ErrCollationNotSupport
 	ErrTableCollationNotSupport
-	ER_ERROR_LAST
+	ErrJsonTypeSupport
 	//ER_NULL_NAME_FOR_INDEX
+	ER_ERROR_LAST
 )
 
 var ErrorsDefault = map[int]string{
@@ -347,6 +348,7 @@ var ErrorsDefault = map[int]string{
 	ErrDataTooLong:                         "Data too long for column '%s' at row %d",
 	ErrCharsetNotSupport:                   "Set charset to one of '%s'.",
 	ErrCollationNotSupport:                 "Set collation to one of '%s'",
+	ErrJsonTypeSupport:                     "Json type not allowed in column '%s'.",
 	ER_ERROR_LAST:                          "TheLastError,ByeBye",
 	//ER_NULL_NAME_FOR_INDEX:                 "Index name cannot be null in table '%s'.",
 }
@@ -503,6 +505,7 @@ var ErrorsChinese = map[int]string{
 	ErrCharsetNotSupport:                   "允许的字符集: '%s'.",
 	ErrCollationNotSupport:                 "允许的排序规则: '%s'.",
 	ErrWrongUsage:                          "%s子句无法使用%s",
+	ErrJsonTypeSupport:                     "不允许使用json类型(列'%s').",
 	//ER_NULL_NAME_FOR_INDEX:                 "在表 '%s' 中, 索引名称不能为空.",
 }
 

diff --git a/session/session_inception.go b/session/session_inception.go
@@ -2988,8 +2988,10 @@ func (s *session) mysqlCheckField(t *TableInfo, field *ast.ColumnDef) {
 	}
 	//是否使用 text\blob\json 字段类型
 	//当EnableNullable=false，不强制text\blob\json使用NOT NULL
-	if types.IsTypeBlob(field.Tp.Tp) || field.Tp.Tp == mysql.TypeJSON {
+	if types.IsTypeBlob(field.Tp.Tp) {
 		s.AppendErrorNo(ER_USE_TEXT_OR_BLOB, field.Name.Name)
+	} else if field.Tp.Tp == mysql.TypeJSON {
+		s.AppendErrorNo(ErrJsonTypeSupport, field.Name.Name)
 	} else {
 		if !notNullFlag && !hasGenerated {
 			s.AppendErrorNo(ER_NOT_ALLOWED_NULLABLE, field.Name.Name, tableName)
@@ -4881,6 +4883,10 @@ func (s *session) checkInceptionVariables(number int) bool {
 		if s.Inc.EnableBlobType {
 			return false
 		}
+	case ErrJsonTypeSupport:
+		if s.Inc.EnableJsonType {
+			return false
+		}
 	case ER_TABLE_MUST_INNODB:
 		if s.Inc.EnableNotInnodb {
 			return false