From 04ee3cb15344835f1e61e2fded070e8d2b1d9b14 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Tue, 4 Jul 2017 20:54:46 +0300 Subject: [PATCH] #1834 Default data type name detect --- .../dbeaver/model/impl/jdbc/JDBCDataSource.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSource.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSource.java index d9aade220e..5890843b3d 100644 --- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSource.java +++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCDataSource.java @@ -525,6 +525,22 @@ public abstract class JDBCDataSource @Override public String getDefaultDataTypeName(@NotNull DBPDataKind dataKind) { + String typeName = getStandardSQLDataTypeName(dataKind); + DBSDataType dataType = getLocalDataType(typeName); + if (dataType == null) { + // No such data type + // Try to find first data type of this kind + for (DBSDataType type : getLocalDataTypes()) { + if (type.getDataKind() == dataKind) { + return type.getName(); + } + } + } + return typeName; + } + + @NotNull + private String getStandardSQLDataTypeName(@NotNull DBPDataKind dataKind) { switch (dataKind) { case BOOLEAN: return "BOOLEAN"; case NUMERIC: return "NUMERIC"; -- GitLab