Skip to content

Commit 71f0c54

Browse files
committed
fix ignore_charset config
1 parent e634415 commit 71f0c54

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

diffsql/diff.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func DiffSchemas(MysqlVersion string, IgnoreCharset bool, srcSchemas map[string]
4848
diffHints := &schemadiff.DiffHints{
4949
StrictIndexOrdering: false,
5050
AutoIncrementStrategy: schemadiff.AutoIncrementIgnore,
51-
TableCharsetCollateStrategy: schemadiff.TableCharsetCollateIgnoreAlways,
51+
TableCharsetCollateStrategy: schemadiff.TableCharsetCollateStrict,
5252
}
5353
if IgnoreCharset {
5454
diffHints.TableCharsetCollateStrategy = schemadiff.TableCharsetCollateIgnoreAlways

main.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ func init() {
7474
config.DstSchemaConf.SqlFile = dstSqlFile
7575
}
7676

77+
if config.IgnoreCharset {
78+
IgnoreCharset = true
79+
}
80+
7781
if err := config.InitAndCheck(MysqlVersion, skipTables); err != nil {
7882
log.Printf("初始化配置失败: %+v\n", err)
7983
os.Exit(1)

0 commit comments

Comments
 (0)