From d0beb1b3ad70bd8379e13bc00e274a3fa88ada03 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Wed, 2 Sep 2020 19:01:43 +0300
Subject: [PATCH] CB-187 NoSQL -> relational transformation

---
 .../src/io/cloudbeaver/service/sql/WebSQLProcessor.java        | 2 +-
 .../io/cloudbeaver/service/sql/WebSQLQueryResultColumn.java    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
index 1a702f19e9..e7185a2244 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
@@ -593,7 +593,7 @@ public class WebSQLProcessor {
                 newRows.add(newRow);
             }
             this.bindings = leafAttributes;
-            rows = newRows;
+            this.rows = newRows;
         }
 
         private void collectLeafBindings(DBDAttributeBinding attr, List<DBDAttributeBinding> leafBindings) {
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryResultColumn.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryResultColumn.java
index 5a331f4cd8..2aaee0c3d5 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryResultColumn.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryResultColumn.java
@@ -17,6 +17,7 @@
 package io.cloudbeaver.service.sql;
 
 import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.model.DBPDataKind;
 import org.jkiss.dbeaver.model.DBPEvaluationContext;
 import org.jkiss.dbeaver.model.DBValueFormatting;
 import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
@@ -48,7 +49,7 @@ public class WebSQLQueryResultColumn {
 
     @Property
     public String getLabel() {
-        if (attrMeta.getParentObject() != null) {
+        if (attrMeta.getParentObject() != null && attrMeta.getParentObject().getDataKind() != DBPDataKind.DOCUMENT) {
             return attrMeta.getParentObject().getFullyQualifiedName(DBPEvaluationContext.UI) + "." + attrMeta.getLabel();
         }
         return attrMeta.getLabel();