CB-187 NoSQL -> relational transformation

This commit is contained in:
Serge Rider
2020-09-02 19:01:43 +03:00
parent 63e66d8226
commit d0beb1b3ad
2 changed files with 3 additions and 2 deletions
@@ -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) {
@@ -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();