Merge pull request #9926 from dbeaver/db-type-map#9685

#9685 Make DBPDataKind.CONTENT and DBPDataKind.BINARY compatible

Former-commit-id: a004e99e

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/DBPDataKind.java

@@ -48,7 +48,7 @@ public enum DBPDataKind
     }
 
     public static boolean canConsume(DBPDataKind sourceKind, DBPDataKind targetKind) {
-        if (targetKind == CONTENT) {
+        if (targetKind == CONTENT || targetKind == BINARY) {
             return sourceKind == STRING || sourceKind == BINARY || sourceKind == CONTENT;
         } else if (targetKind == STRING) {
             return sourceKind == STRING;// || sourceKind == NUMERIC || sourceKind == BOOLEAN || sourceKind == DATETIME;

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/struct/DBStructUtils.java

@@ -236,7 +236,7 @@ public final class DBStructUtils {
                 // Let's try to find something similar
                 Map<String, DBSDataType> possibleTypes = new HashMap<>();
                 for (DBSDataType type : dataTypeProvider.getLocalDataTypes()) {
-                    if (type.getDataKind() == dataKind) {
+                    if (DBPDataKind.canConsume(type.getDataKind(), dataKind)) {
                         possibleTypes.put(type.getTypeName().toLowerCase(Locale.ENGLISH), type);
                     }
                 }