From e6d3b2af7f07ad30026b6c3798e7540aea1c1633 Mon Sep 17 00:00:00 2001 From: Ainur <59531286+yagudin10@users.noreply.github.com> Date: Wed, 5 Jul 2023 11:18:32 +0200 Subject: [PATCH] CB-3576 data receiver return dative database results (#1794) * CB-3576 return string for array data kind * CB-3576 add comment --- .../io/cloudbeaver/service/sql/WebSQLQueryDataReceiver.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryDataReceiver.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryDataReceiver.java index 0c78d29acd..4a195bc00a 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryDataReceiver.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryDataReceiver.java @@ -20,6 +20,7 @@ import io.cloudbeaver.model.session.WebSession; import io.cloudbeaver.server.CBApplication; import org.jkiss.dbeaver.DBException; import org.jkiss.dbeaver.Log; +import org.jkiss.dbeaver.model.DBPDataKind; import org.jkiss.dbeaver.model.DBUtils; import org.jkiss.dbeaver.model.data.*; import org.jkiss.dbeaver.model.exec.*; @@ -184,6 +185,11 @@ class WebSQLQueryDataReceiver implements DBDDataReceiver { } private void collectLeafBindings(DBDAttributeBinding attr, List leafBindings) { + // we need to show arrays as string because there was a problem with showing multiple rows for custom objects + if (attr.getDataKind() == DBPDataKind.ARRAY) { + leafBindings.add(attr); + return; + } List nestedBindings = attr.getNestedBindings(); if (CommonUtils.isEmpty(nestedBindings)) { leafBindings.add(attr);