Merge branch 'devel' of https://github.com/dbeaver/dbeaver into debug__refactoring

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetDataReceiver.java

@@ -22,6 +22,8 @@ import org.jkiss.dbeaver.model.DBUtils;
 import org.jkiss.dbeaver.model.data.DBDAttributeBindingMeta;
 import org.jkiss.dbeaver.model.data.DBDDataReceiver;
 import org.jkiss.dbeaver.model.exec.*;
+import org.jkiss.dbeaver.model.struct.DBSDataContainer;
+import org.jkiss.dbeaver.model.struct.DBSEntity;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -140,7 +142,12 @@ class ResultSetDataReceiver implements DBDDataReceiver {
         if (!nextSegmentRead) {
             try {
                 // Read locators' metadata
-                ResultSetUtils.bindAttributes(session, resultSet, metaColumns, rows);
+                DBSEntity entity = null;
+                DBSDataContainer dataContainer = resultSetViewer.getDataContainer();
+                if (dataContainer instanceof DBSEntity) {
+                    entity = (DBSEntity) dataContainer;
+                }
+                ResultSetUtils.bindAttributes(session, entity, resultSet, metaColumns, rows);
             } catch (Throwable e) {
                 errorList.add(e);
             }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetUtils.java

@@ -66,6 +66,7 @@ public class ResultSetUtils
 
     public static void bindAttributes(
         @NotNull DBCSession session,
+        @Nullable DBSEntity sourceEntity,
         @Nullable DBCResultSet resultSet,
         @NotNull DBDAttributeBindingMeta[] bindings,
         @Nullable List<Object[]> rows) throws DBException
@@ -84,7 +85,9 @@ public class ResultSetUtils
         try {
             SQLQuery sqlQuery = null;
             DBSEntity entity = null;
-            if (resultSet != null) {
+            if (sourceEntity != null) {
+                entity = sourceEntity;
+            } else if (resultSet != null) {
                 DBCStatement sourceStatement = resultSet.getSourceStatement();
                 if (sourceStatement != null && sourceStatement.getStatementSource() != null) {
                     DBCExecutionSource executionSource = sourceStatement.getStatementSource();

plugins/org.jkiss.dbeaver.data.office/src/org/jkiss/dbeaver/data/office/export/DataExporterXLSX.java

@@ -33,6 +33,7 @@ import org.jkiss.dbeaver.model.data.DBDContent;
 import org.jkiss.dbeaver.model.data.DBDContentStorage;
 import org.jkiss.dbeaver.model.exec.DBCSession;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
+import org.jkiss.dbeaver.model.struct.DBSEntity;
 import org.jkiss.dbeaver.tools.transfer.stream.IStreamDataExporterSite;
 import org.jkiss.dbeaver.tools.transfer.stream.impl.StreamExporterAbstract;
 import org.jkiss.dbeaver.ui.controls.resultset.ResultSetUtils;
@@ -306,7 +307,11 @@ public class DataExporterXLSX extends StreamExporterAbstract {
                 }
             }
             if (bindingsOk) {
-                ResultSetUtils.bindAttributes(session, null, bindings, null);
+                DBSEntity sourceEntity = null;
+                if (getSite().getSource() instanceof DBSEntity) {
+                    sourceEntity = (DBSEntity) getSite().getSource();
+                }
+                ResultSetUtils.bindAttributes(session, sourceEntity, null, bindings, null);
             }
         }
 	        /*if (printHeader) { FIXME