#9457 Table columns recognition fix (PG-specific)

plugins/org.jkiss.dbeaver.ext.greenplum/src/org/jkiss/dbeaver/ext/greenplum/model/PostgreServerGreenplum.java

@@ -90,6 +90,11 @@ public class PostgreServerGreenplum extends PostgreServerExtensionBase {
                 "LOG", "ERRORS");
     }
 
+    @Override
+    public boolean supportsEntityMetadataInResults() {
+        return true;
+    }
+
     @Override
     public boolean supportsExplainPlanXML() {
         return false;

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataSourceInfo.java

@@ -44,8 +44,8 @@ class PostgreDataSourceInfo extends JDBCDataSourceInfo {
     }
 
     @Override
-    public boolean supportsDuplicateColumnsInResults() {
-        return true;
+    public boolean needsTableMetaForColumnResolution() {
+        return dataSource.getServerType().supportsEntityMetadataInResults();
     }
 
     @Override

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreServerExtension.java

@@ -121,4 +121,8 @@ public interface PostgreServerExtension
     Map<String, String> getDataTypeAliases();
 
     boolean supportsTableStatistics();
+
+    // True if driver returns source table name in ResultSetMetaData.
+    // It works for original PG driver but doesn't work for many forks (e.g. Redshift).
+    boolean supportsEntityMetadataInResults();
 }

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/impls/PostgreServerEdb.java

@@ -29,6 +29,11 @@ public class PostgreServerEdb extends PostgreServerExtensionBase {
         super(dataSource);
     }
 
+    @Override
+    public boolean supportsEntityMetadataInResults() {
+        return true;
+    }
+
     @Override
     public String getServerTypeName() {
         return "EnterpriseDB";

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/impls/PostgreServerExtensionBase.java

@@ -338,6 +338,11 @@ public abstract class PostgreServerExtensionBase implements PostgreServerExtensi
         return true;
     }
 
+    @Override
+    public boolean supportsEntityMetadataInResults() {
+        return false;
+    }
+
     @Override
     public boolean supportsExplainPlan() {
         return true;

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/impls/PostgreServerPostgreSQL.java

@@ -29,6 +29,11 @@ public class PostgreServerPostgreSQL extends PostgreServerExtensionBase {
         super(dataSource);
     }
 
+    @Override
+    public boolean supportsEntityMetadataInResults() {
+        return true;
+    }
+
     @Override
     public String getServerTypeName() {
         return "PostgreSQL";

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

@@ -172,5 +172,5 @@ public interface DBPDataSourceInfo
 
     DBSObjectType[] getSupportedObjectTypes();
 
-    boolean supportsDuplicateColumnsInResults();
+    boolean needsTableMetaForColumnResolution();
 }

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/exec/DBExecUtils.java

@@ -704,7 +704,7 @@ public class DBExecUtils {
                         //  - We use some explicit entity (e.g. table data editor)
                         //  - Table metadata was specified for column
                         //  - Database doesn't support column name collisions (default)
-                        (sourceEntity != null || bindingMeta.getMetaAttribute().getEntityMetaData() != null || !bindingMeta.getDataSource().getInfo().supportsDuplicateColumnsInResults()) &&
+                        (sourceEntity != null || bindingMeta.getMetaAttribute().getEntityMetaData() != null || !bindingMeta.getDataSource().getInfo().needsTableMetaForColumnResolution()) &&
                         bindingMeta.setEntityAttribute(
                             tableColumn,
                             ((sqlQuery == null || tableColumn.getTypeID() != attrMeta.getTypeID()) && rows != null)))

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractDataSourceInfo.java

@@ -116,7 +116,7 @@ public abstract class AbstractDataSourceInfo implements DBPDataSourceInfo
     }
 
     @Override
-    public boolean supportsDuplicateColumnsInResults() {
+    public boolean needsTableMetaForColumnResolution() {
         return false;
     }