fixed DatabaseTableMeta#compareTableMeta

This commit is contained in:
wuwo
2018-11-09 19:23:03 +08:00
parent 8c1f15a49e
commit 417e04f655

View File

@@ -502,11 +502,13 @@ public class DatabaseTableMeta implements TableMetaTSDB {
return false; return false;
} }
String sign = sourceField.isUnsigned() ? "unsigned" : "signed";
String sourceColumnType = StringUtils.removeEndIgnoreCase(sourceField.getColumnType(), sign).trim();
String targetColumnType = StringUtils.removeEndIgnoreCase(targetField.getColumnType(), sign).trim();
boolean columnTypeCompare = false; boolean columnTypeCompare = false;
columnTypeCompare |= StringUtils.containsIgnoreCase(sourceField.getColumnType(), columnTypeCompare |= StringUtils.containsIgnoreCase(sourceColumnType, targetColumnType);
targetField.getColumnType()); columnTypeCompare |= StringUtils.containsIgnoreCase(targetColumnType, sourceColumnType);
columnTypeCompare |= StringUtils.containsIgnoreCase(targetField.getColumnType(),
sourceField.getColumnType());
if (!columnTypeCompare) { if (!columnTypeCompare) {
return false; return false;
} }