diff --git a/ddl/run.go b/ddl/run.go index 68300b6..3d3ad77 100644 --- a/ddl/run.go +++ b/ddl/run.go @@ -135,7 +135,8 @@ func dmlIgnoreError(err error) bool { strings.Contains(errStr, "Bad Number") || strings.Contains(errStr, "invalid year") || strings.Contains(errStr, "value is out of range in") || - strings.Contains(errStr, "Data Too Long") { + strings.Contains(errStr, "Data Too Long") || + strings.Contains(errStr, "cannot convert datum from decimal to type year") { return true } return false @@ -175,16 +176,18 @@ func ddlIgnoreError(err error) bool { strings.Contains(errStr, "Unsupported modifying collation of column") || strings.Contains(errStr, "Data truncated") || strings.Contains(errStr, "Bad Number") || - strings.Contains(errStr, "cannot convert")|| - strings.Contains(errStr, "Data Too Long")|| + strings.Contains(errStr, "cannot convert") || + strings.Contains(errStr, "Data Too Long") || // eg: For v"BLOB/TEXT column '319de167-6d2e-4778-966c-60b95103a02c' used in key specification without a key length" - strings.Contains(errStr, "used in key specification without a key length") { + strings.Contains(errStr, "used in key specification without a key length") || + strings.Contains(errStr, "Too many keys specified; max 64 keys allowed") || + strings.Contains(errStr, "BLOB/TEXT/JSON column can't have a default value") { fmt.Println(errStr) return true } if strings.Contains(errStr, "table doesn't exist") || strings.Contains(errStr, "doesn't have a default value") || - strings.Contains(errStr,"with composite index covered or Primary Key covered now") || + strings.Contains(errStr, "with composite index covered or Primary Key covered now") || strings.Contains(errStr, "is not exists") || strings.Contains(errStr, "column does not exist") || strings.Contains(errStr, "doesn't exist") || strings.Contains(errStr, "Unknown table") || strings.Contains(errStr, "admin show ddl jobs len != len(tasks)") ||