From 8b2c4f9a7009de1c2a2dd0a393bda2a45b5324d4 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Thu, 18 Jul 2019 13:21:18 +0200
Subject: [PATCH] PG: data type resolve fix

Former-commit-id: 1135643e4b90079cbd1880f9e1107a03116edad8
---
 .../dbeaver/ext/postgresql/PostgreUtils.java  | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreUtils.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreUtils.java
index 99882bf80b..57374c1314 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreUtils.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreUtils.java
@@ -48,6 +48,7 @@ import org.jkiss.dbeaver.model.impl.edit.SQLDatabasePersistAction;
 import org.jkiss.dbeaver.model.impl.edit.SQLDatabasePersistActionComment;
 import org.jkiss.dbeaver.model.impl.jdbc.JDBCDataSource;
 import org.jkiss.dbeaver.model.impl.jdbc.JDBCUtils;
+import org.jkiss.dbeaver.model.impl.jdbc.exec.JDBCColumnMetaData;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.*;
 import org.jkiss.utils.ArrayUtils;
@@ -419,16 +420,27 @@ public class PostgreUtils {
         if (column instanceof PostgreAttribute) {
             return ((PostgreAttribute) column).getDataType();
         } else {
-            if (column instanceof DBCAttributeMetaData) {
+            if (column instanceof JDBCColumnMetaData) {
                 try {
                     DBCEntityMetaData entityMetaData = ((DBCAttributeMetaData) column).getEntityMetaData();
-                    DBSEntity docEntity = DBUtils.getEntityFromMetaData(session.getProgressMonitor(), session.getDataSource(), entityMetaData);
-                    if (docEntity != null) {
-                        DBSEntityAttribute attribute = docEntity.getAttribute(session.getProgressMonitor(), ((DBCAttributeMetaData) column).getName());
-                        if (attribute instanceof DBSTypedObjectEx) {
-                            DBSDataType dataType = ((DBSTypedObjectEx) attribute).getDataType();
-                            if (dataType instanceof PostgreDataType) {
-                                return (PostgreDataType) dataType;
+                    if (entityMetaData != null) {
+                        DBSEntity docEntity = DBUtils.getEntityFromMetaData(session.getProgressMonitor(), session.getDataSource(), entityMetaData);
+                        if (docEntity != null) {
+                            DBSEntityAttribute attribute = docEntity.getAttribute(session.getProgressMonitor(), ((DBCAttributeMetaData) column).getName());
+                            if (attribute instanceof DBSTypedObjectEx) {
+                                DBSDataType dataType = ((DBSTypedObjectEx) attribute).getDataType();
+                                if (dataType instanceof PostgreDataType) {
+                                    return (PostgreDataType) dataType;
+                                }
+                            }
+                        }
+                    } else {
+                        String databaseName = ((JDBCColumnMetaData) column).getCatalogName();
+                        PostgreDatabase database = dataSource.getDatabase(databaseName);
+                        if (database != null) {
+                            PostgreDataType dataType = database.getDataType(session.getProgressMonitor(), column.getTypeName());
+                            if (dataType != null) {
+                                return dataType;
                             }
                         }
                     }
-- 
GitLab