Cb 4457 subcollections firestore

server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls

@@ -93,6 +93,11 @@ type SQLResultColumn {
     supportedOperations: [DataTypeLogicalOperation!]!
 }
 
+type SQLResultRowMetaData {
+    data: [Object]
+    metaData: Object
+}
+
 type DatabaseDocument {
     id: String
     contentType: String
@@ -103,7 +108,8 @@ type DatabaseDocument {
 type SQLResultSet {
     id: ID!
     columns: [ SQLResultColumn ]
-    rows: [ [ Object ] ]
+    rows: [ [ Object ] ] @deprecated
+    rowsWithMetaData: [SQLResultRowMetaData]
 
     # True means that resultset was generated by single entity query
     # New rows can be added, old rows can be deleted
@@ -112,6 +118,8 @@ type SQLResultSet {
     hasMoreData: Boolean!
     # can't update data or load LOB file if hasRowIdentifier = false
     hasRowIdentifier: Boolean!
+    hasChildrenCollection: Boolean!
+    isSupportsDataFilter: Boolean!
 }
 
 type SQLQueryResults {
@@ -144,6 +152,12 @@ type SQLExecuteInfo {
 input SQLResultRow {
     data: [ Object ]!
     updateValues: Object
+    metaData: Object
+}
+
+input SQLResultRowMetaDataInput {
+    data: [Object]
+    metaData: Object!
 }
 
 type DataTypeLogicalOperation {
@@ -386,4 +400,5 @@ extend type Mutation {
     ): AsyncTaskInfo!
 
     asyncSqlRowDataCountResult(taskId: ID!): Int!
+
 }

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java

@@ -331,7 +331,7 @@
     {
         // we don't need to add same row several times
         // (it can be when we update the row from RS with several tables)
-        Set<Object[]> newResultSetRows = new LinkedHashSet<>();
+        Set<WebSQLQueryResultSetRow> newResultSetRows = new LinkedHashSet<>();
         KeyDataReceiver keyReceiver = new KeyDataReceiver(contextInfo.getResults(resultsId));
         WebSQLResultsInfo resultsInfo = contextInfo.getResults(resultsId);
 
@@ -372,7 +372,7 @@
 
                         totalUpdateCount += statistics.getRowsUpdated();
                         result.setDuration(result.getDuration() + statistics.getExecuteTime());
-                        newResultSetRows.add(rowValues);
+                        newResultSetRows.add(new WebSQLQueryResultSetRow(rowValues, null));
                     }
 
                     if (txnManager != null && txnManager.isSupportsTransactions()) {
@@ -399,7 +399,7 @@
         WebSQLQueryResults updateResults = new WebSQLQueryResults(webSession, dataFormat);
         updateResults.setUpdateRowCount(totalUpdateCount);
         updateResults.setResultSet(updatedResultSet);
-        updatedResultSet.setRows(newResultSetRows.toArray(new Object[0][]));
+        updatedResultSet.setRows(List.of(newResultSetRows.toArray(new WebSQLQueryResultSetRow[0])));
 
         queryResults.add(updateResults);
 
@@ -410,7 +410,7 @@
 
     private void getUpdatedRowsInfo(
         @NotNull WebSQLResultsInfo resultsInfo,
-        @NotNull Set<Object[]> newResultSetRows,
+        @NotNull Set<WebSQLQueryResultSetRow> newResultSetRows,
         @Nullable WebDataFormat dataFormat,
         @NotNull DBRProgressMonitor monitor)
         throws DBCException {
@@ -420,8 +420,8 @@
             "Refresh row(s) after insert/update")
         ) {
             boolean canRefreshResults = resultsInfo.canRefreshResults();
-            for (Object[] row : newResultSetRows) {
-                if (row.length == 0) {
+            for (WebSQLQueryResultSetRow row : newResultSetRows) {
+                if (row.getData().length == 0) {
                     continue;
                 }
                 if (!canRefreshResults) {
@@ -438,7 +438,7 @@
                     if (attr.getRowIdentifier() == null) {
                         continue;
                     }
-                    final Object keyValue = row[attr.getOrdinalPosition()];
+                    final Object keyValue = row.getData()[attr.getOrdinalPosition()];
                     if (DBUtils.isNullValue(keyValue)) {
                         hasKey = false;
                         break;
@@ -455,7 +455,7 @@
                 }
                 DBDDataFilter filter = new DBDDataFilter(constraints);
                 DBSDataContainer dataContainer = resultsInfo.getDataContainer();
-                WebRowDataReceiver dataReceiver = new WebRowDataReceiver(resultsInfo.getAttributes(), row, dataFormat);
+                WebRowDataReceiver dataReceiver = new WebRowDataReceiver(resultsInfo.getAttributes(), row.getData(), dataFormat);
                 dataContainer.readData(
                     new AbstractExecutionSource(dataContainer, getExecutionContext(dataContainer), this),
                     session,
@@ -471,14 +471,14 @@
 
     private void makeWebCellRow(
         @NotNull WebSQLResultsInfo resultsInfo,
-        @NotNull Object[] row,
+        @NotNull WebSQLQueryResultSetRow row,
         @Nullable WebDataFormat dataFormat
     ) throws DBCException {
-        for (int i = 0; i < row.length; i++) {
-            row[i] = WebSQLUtils.makeWebCellValue(
+        for (int i = 0; i < row.getData().length; i++) {
+            row.getData()[i] = WebSQLUtils.makeWebCellValue(
                 webSession,
                 resultsInfo.getAttributeByPosition(i),
-                row[i],
+                row.getData()[i],
                 dataFormat);
         }
     }
@@ -563,6 +563,11 @@
                     Map<String, Object> updateValues = row.getUpdateValues().entrySet().stream()
                         .filter(x -> CommonUtils.equalObjects(allAttributes[CommonUtils.toInt(x.getKey())].getRowIdentifier(), rowIdentifier))
                         .collect(HashMap::new, (m,v) -> m.put(v.getKey(), v.getValue()), HashMap::putAll);
+
+                    Map<String, Object> metaData = row.getMetaData().entrySet().stream()
+                            .filter(x -> CommonUtils.equalObjects(allAttributes[CommonUtils.toInt(x.getKey())].getRowIdentifier(), rowIdentifier))
+                            .collect(HashMap::new, (m,v) -> m.put(v.getKey(), v.getValue()), HashMap::putAll);
+
                     if (finalRow.length == 0 || CommonUtils.isEmpty(updateValues)) {
                         continue;
                     }
@@ -582,7 +587,7 @@
                         boolean isDocumentValue = keyAttributes.length == 1 && keyAttribute.getDataKind() == DBPDataKind.DOCUMENT && dataContainer instanceof DBSDocumentLocator;
                         if (isDocumentValue) {
                             rowValues[updateAttributes.length + i] =
-                                makeDocumentInputValue(session, (DBSDocumentLocator) dataContainer, resultsInfo, row);
+                                makeDocumentInputValue(session, (DBSDocumentLocator) dataContainer, resultsInfo, row, metaData);
                         } else {
                             rowValues[updateAttributes.length + i] = keyAttribute.getValueHandler().getValueFromObject(
                                 session,
@@ -693,7 +698,8 @@
         DBCSession session,
         DBSDocumentLocator dataContainer,
         WebSQLResultsInfo resultsInfo,
-        WebSQLResultsRow row) throws DBException
+        WebSQLResultsRow row,
+        Map<String, Object> metaData) throws DBException
     {
         // Document reference
         DBDDocument document = null;
@@ -711,7 +717,7 @@
             keyMap.put(attr.getName(), plainValue);
         }
         if (document == null) {
-            document = dataContainer.findDocument(session.getProgressMonitor(), keyMap);
+            document = dataContainer.findDocument(session, keyMap, metaData);
             if (document == null) {
                 throw new DBCException("Error finding document by key " + keyMap);
             }
@@ -826,7 +832,7 @@
                 boolean isDocumentValue = keyAttributes.length == 1 && keyAttribute.getDataKind() == DBPDataKind.DOCUMENT && dataContainer instanceof DBSDocumentLocator;
                 if (isDocumentValue) {
                     rowValues[i] =
-                        makeDocumentInputValue(session, (DBSDocumentLocator) dataContainer, resultsInfo, row);
+                        makeDocumentInputValue(session, (DBSDocumentLocator) dataContainer, resultsInfo, row, null);
                 } else {
                     Object inputCellValue = row.getData()[keyAttribute.getOrdinalPosition()];
 

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryDataReceiver.java

@@ -25,13 +25,15 @@
 import org.jkiss.dbeaver.model.data.*;
 import org.jkiss.dbeaver.model.exec.*;
 import org.jkiss.dbeaver.model.impl.data.DBDValueError;
+import org.jkiss.dbeaver.model.meta.MetaData;
 import org.jkiss.dbeaver.model.sql.DBQuotaException;
 import org.jkiss.dbeaver.model.struct.DBSDataContainer;
 import org.jkiss.dbeaver.model.struct.DBSEntity;
 import org.jkiss.utils.CommonUtils;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.stream.Collectors;
 
 class WebSQLQueryDataReceiver implements DBDDataReceiver {
     private static final Log log = Log.getLog(WebSQLQueryDataReceiver.class);
@@ -42,7 +44,7 @@
     private final WebSQLQueryResultSet webResultSet = new WebSQLQueryResultSet();
 
     private DBDAttributeBinding[] bindings;
-    private List<Object[]> rows = new ArrayList<>();
+    private List<WebSQLQueryResultSetRow> rows = new ArrayList<>();
     private final Number rowLimit;
 
     WebSQLQueryDataReceiver(WebSQLContextInfo contextInfo, DBSDataContainer dataContainer, WebDataFormat dataFormat) {
@@ -70,6 +72,7 @@
     @Override
     public void fetchRow(DBCSession session, DBCResultSet resultSet) throws DBCException {
 
+        Map<String, Object> metaDataMap = null;
         Object[] row = new Object[bindings.length];
 
         for (int i = 0; i < bindings.length; i++) {
@@ -81,12 +84,23 @@
                     binding.getMetaAttribute(),
                     i);
                 row[i] = cellValue;
+                Method[] methods = Objects.requireNonNull(cellValue).getClass().getMethods();
+                for (Method method : methods) {
+                    if (method.isAnnotationPresent(MetaData.class)){
+                        if (metaDataMap == null) {
+                            metaDataMap = new HashMap<>();
+                        }
+                        Object value = method.invoke(cellValue);
+                        metaDataMap.put(method.getAnnotation(MetaData.class).name(), value);
+                    }
+                }
+
             } catch (Throwable e) {
                 row[i] = new DBDValueError(e);
             }
         }
 
-        rows.add(row);
+        rows.add(new WebSQLQueryResultSetRow(row, metaDataMap));
 
         if (rowLimit != null && rows.size() > rowLimit.longValue()) {
             throw new DBQuotaException(
@@ -101,7 +115,7 @@
         DBSEntity entity = dataContainer instanceof DBSEntity ? (DBSEntity) dataContainer : null;
 
         try {
-            DBExecUtils.bindAttributes(session, entity, resultSet, bindings, rows);
+            DBExecUtils.bindAttributes(session, entity, resultSet, bindings, rows.stream().map(WebSQLQueryResultSetRow::getData).collect(Collectors.toList()));
         } catch (DBException e) {
             log.error("Error binding attributes", e);
         }
@@ -122,15 +136,17 @@
         }
 
         // Convert row values
-        for (Object[] row : rows) {
+        for (WebSQLQueryResultSetRow row : rows) {
             for (int i = 0; i < bindings.length; i++) {
                 DBDAttributeBinding binding = bindings[i];
-                row[i] = WebSQLUtils.makeWebCellValue(webSession, binding, row[i], dataFormat);
+                row.getData()[i] = WebSQLUtils.makeWebCellValue(webSession, binding, row.getData()[i], dataFormat);
             }
         }
 
         webResultSet.setColumns(bindings);
-        webResultSet.setRows(rows.toArray(new Object[0][]));
+        webResultSet.setRows(List.of(rows.toArray(new WebSQLQueryResultSetRow[0])));
+        webResultSet.setHasChildrenCollection(resultSet instanceof DBDSubCollectionResultSet);
+        webResultSet.setSupportsDataFilter(dataContainer.isFeatureSupported(DBSDataContainer.FEATURE_DATA_FILTER));
 
         WebSQLResultsInfo resultsInfo = contextInfo.saveResult(dataContainer, bindings);
         webResultSet.setResultsInfo(resultsInfo);
@@ -157,14 +173,14 @@
         // Convert original rows into new rows with leaf attributes
         // Extract values for leaf attributes from original row
         DBDAttributeBinding[] leafAttributes = leafBindings.toArray(new DBDAttributeBinding[0]);
-        List<Object[]> newRows = new ArrayList<>();
-        for (Object[] row : rows) {
+        List<WebSQLQueryResultSetRow> newRows = new ArrayList<>();
+        for (WebSQLQueryResultSetRow row : rows) {
             Object[] newRow = new Object[leafBindings.size()];
             for (int i = 0; i < leafBindings.size(); i++) {
                 DBDAttributeBinding leafAttr = leafBindings.get(i);
                 try {
                     //Object topValue = row[leafAttr.getTopParent().getOrdinalPosition()];
-                    Object cellValue = DBUtils.getAttributeValue(leafAttr, leafAttributes, row);
+                    Object cellValue = DBUtils.getAttributeValue(leafAttr, leafAttributes, row.getData());
 /*
                     Object cellValue = leafAttr.getValueHandler().getValueFromObject(
                         session,
@@ -178,7 +194,7 @@
                     newRow[i] = new DBDValueError(e);
                 }
             }
-            newRows.add(newRow);
+            newRows.add(new WebSQLQueryResultSetRow(newRow, row.getMetaData()));
         }
         this.bindings = leafAttributes;
         this.rows = newRows;

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryResultSet.java

@@ -19,6 +19,11 @@
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
 import org.jkiss.dbeaver.model.meta.Property;
+import org.jkiss.utils.Pair;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Web SQL query resultset.
@@ -28,12 +33,15 @@ public class WebSQLQueryResultSet {
     private static final Log log = Log.getLog(WebSQLQueryResultSet.class);
 
     private WebSQLQueryResultColumn[] columns;
-    private Object[][] rows;
+    private List<WebSQLQueryResultSetRow> rows;
     private boolean hasMoreData;
     private WebSQLResultsInfo resultsInfo;
     private boolean singleEntity = true;
     private boolean hasRowIdentifier;
 
+    private boolean hasChildrenCollection;
+    private boolean isSupportsDataFilter;
+
     public WebSQLQueryResultSet() {
     }
 
@@ -60,11 +68,17 @@ public void setColumns(DBDAttributeBinding[] bindings) {
     }
 
     @Property
+    @Deprecated
     public Object[][] getRows() {
+        return rows.stream().map(WebSQLQueryResultSetRow::getData).toArray(x -> new Object[x][1]);
+    }
+
+    @Property
+    public List<WebSQLQueryResultSetRow> getRowsWithMetaData() {
         return rows;
     }
 
-    public void setRows(Object[][] rows) {
+    public void setRows(List<WebSQLQueryResultSetRow> rows) {
         this.rows = rows;
     }
 
@@ -102,4 +116,22 @@ public boolean isHasRowIdentifier() {
     public void setHasRowIdentifier(boolean hasRowIdentifier) {
         this.hasRowIdentifier = hasRowIdentifier;
     }
+
+    @Property
+    public boolean isHasChildrenCollection() {
+        return hasChildrenCollection;
+    }
+
+    public void setHasChildrenCollection(boolean hasSuCollection) {
+        this.hasChildrenCollection = hasSuCollection;
+    }
+
+    @Property
+    public boolean isSupportsDataFilter() {
+        return isSupportsDataFilter;
+    }
+
+    public void setSupportsDataFilter(boolean supportsDataFilter) {
+        isSupportsDataFilter = supportsDataFilter;
+    }
 }