diff --git a/dumpling/export/dump.go b/dumpling/export/dump.go index ca10bdb7c4205..845d46cc3cdc9 100755 --- a/dumpling/export/dump.go +++ b/dumpling/export/dump.go @@ -424,7 +424,7 @@ func adjustDatabaseCollation(tctx *tcontext.Context, parser *parser.Parser, orig // get db collation collation, ok := charsetAndDefaultCollationMap[strings.ToLower(charset)] if !ok { - tctx.L().Error("not found database charset default collation.", zap.String("originSQL", originSQL), zap.String("charset", strings.ToLower(charset))) + tctx.L().Warn("not found database charset default collation.", zap.String("originSQL", originSQL), zap.String("charset", strings.ToLower(charset))) return originSQL, nil } // add collation @@ -437,7 +437,7 @@ func adjustDatabaseCollation(tctx *tcontext.Context, parser *parser.Parser, orig In: bf, }) if err != nil { - return "", err + return "", errors.Trace(err) } return bf.String(), nil } @@ -467,7 +467,7 @@ func adjustTableCollation(tctx *tcontext.Context, parser *parser.Parser, originS // get db collation collation, ok := charsetAndDefaultCollationMap[strings.ToLower(charset)] if !ok { - tctx.L().Error("not found table charset default collation.", zap.String("originSQL", originSQL), zap.String("charset", strings.ToLower(charset))) + tctx.L().WARN("not found table charset default collation.", zap.String("originSQL", originSQL), zap.String("charset", strings.ToLower(charset))) return originSQL, nil } @@ -481,7 +481,7 @@ func adjustTableCollation(tctx *tcontext.Context, parser *parser.Parser, originS In: bf, }) if err != nil { - return "", err + return "", errors.Trace(err) } return bf.String(), nil } diff --git a/dumpling/tests/placement_policy/run.sh b/dumpling/tests/placement_policy/run.sh index b7653fc921378..d5bd513acd41c 100644 --- a/dumpling/tests/placement_policy/run.sh +++ b/dumpling/tests/placement_policy/run.sh @@ -25,6 +25,7 @@ file_should_exist "$DUMPLING_OUTPUT_DIR/x1-placement-policy-create.sql" diff "$DUMPLING_BASE_NAME/result/x-placement-policy-create.sql" "$DUMPLING_OUTPUT_DIR/x-placement-policy-create.sql" diff "$DUMPLING_BASE_NAME/result/x1-placement-policy-create.sql" "$DUMPLING_OUTPUT_DIR/x1-placement-policy-create.sql" -run_sql "drop database if exists policy" run_sql "drop placement policy if exists x" run_sql "drop placement policy if exists x1" +run_sql "drop database if exists policy" +