From f23be4fc6ea78e023ef6bbeb8fdcbaceb3c9fc0e Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Wed, 2 Sep 2020 11:33:27 +0300
Subject: [PATCH] Bindings

---
 .../src/io/cloudbeaver/service/sql/WebSQLProcessor.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 42ef34dee1..86947a37e5 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
@@ -515,7 +515,6 @@ public class WebSQLProcessor {
 
         @Override
         public void fetchEnd(DBCSession session, DBCResultSet resultSet) throws DBCException {
-            webResultSet.setRows(rows.toArray(new Object[0][]));
 
             DBSEntity entity = dataContainer instanceof DBSEntity ? (DBSEntity) dataContainer : null;
 
@@ -525,12 +524,19 @@ public class WebSQLProcessor {
                 log.error("Error binding attributes", e);
             }
 
+            convertComplexValuesToRelationalView();
+
             webResultSet.setColumns(bindings);
+            webResultSet.setRows(rows.toArray(new Object[0][]));
 
             WebSQLResultsInfo resultsInfo = contextInfo.saveResult(dataContainer, bindings);
             webResultSet.setResultsInfo(resultsInfo);
         }
 
+        private void convertComplexValuesToRelationalView() {
+            // Here we get leaf attributes and refetch them into plain tabl structure
+        }
+
         @Override
         public void close() {
             rows.clear();