Merge pull request #1128 from spccold/master
fixed DatabaseTableMeta#compareTableMeta
This commit is contained in:
+6
-4
@@ -502,11 +502,13 @@ public class DatabaseTableMeta implements TableMetaTSDB {
|
||||
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;
|
||||
columnTypeCompare |= StringUtils.containsIgnoreCase(sourceField.getColumnType(),
|
||||
targetField.getColumnType());
|
||||
columnTypeCompare |= StringUtils.containsIgnoreCase(targetField.getColumnType(),
|
||||
sourceField.getColumnType());
|
||||
columnTypeCompare |= StringUtils.containsIgnoreCase(sourceColumnType, targetColumnType);
|
||||
columnTypeCompare |= StringUtils.containsIgnoreCase(targetColumnType, sourceColumnType);
|
||||
if (!columnTypeCompare) {
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user