From 0e402cd27dc04d12fe349aecd6cc9a67a9ce6aab Mon Sep 17 00:00:00 2001
From: Elizabeth <28875055+E1izabeth@users.noreply.github.com>
Date: Tue, 28 Apr 2026 16:12:38 +0300
Subject: [PATCH] dbeaver/pro#8775 Introduce value path to getCellValue method
 (#4304)

Co-authored-by: Diana <31996417+uslss@users.noreply.github.com>
---
 .../sql/impl/WebDBDResultSetDataProvider.java        | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebDBDResultSetDataProvider.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebDBDResultSetDataProvider.java
index b762547e42..1f20548ce9 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebDBDResultSetDataProvider.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebDBDResultSetDataProvider.java
@@ -25,10 +25,7 @@ import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.DBPDataSource;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.DBUtils;
-import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
-import org.jkiss.dbeaver.model.data.DBDResultSetDataProvider;
-import org.jkiss.dbeaver.model.data.DBDRowIdentifier;
-import org.jkiss.dbeaver.model.data.DBDValueRow;
+import org.jkiss.dbeaver.model.data.*;
 import org.jkiss.dbeaver.model.data.hints.DBDValueHintContext;
 import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
 import org.jkiss.dbeaver.model.struct.DBSEntity;
@@ -122,9 +119,14 @@ public class WebDBDResultSetDataProvider implements DBDResultSetDataProvider, DB
         @NotNull DBDAttributeBinding attribute,
         @NotNull DBDValueRow row,
         @Nullable int[] rowIndexes,
+        @Nullable ResultSetValuePath valuePath,
         boolean retrieveDeepestCollectionElement
     ) throws DBWebException {
-        return DBUtils.getAttributeValue(attribute, getAttributes(), row.getValues());
+        if (valuePath != null) {
+            return DBUtils.getRowValueByPath(row, valuePath);
+        } else {
+            return DBUtils.getAttributeValue(attribute, getAttributes(), row.getValues());
+        }
     }
 
     @Nullable