Skip to content

Commit 0e402cd

Browse files
E1izabethuslss
andauthored
dbeaver/pro#8775 Introduce value path to getCellValue method (#4304)
Co-authored-by: Diana <31996417+uslss@users.noreply.github.com>
1 parent d79054a commit 0e402cd

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/impl/WebDBDResultSetDataProvider.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@
2525
import org.jkiss.dbeaver.model.DBPDataSource;
2626
import org.jkiss.dbeaver.model.DBPDataSourceContainer;
2727
import org.jkiss.dbeaver.model.DBUtils;
28-
import org.jkiss.dbeaver.model.data.DBDAttributeBinding;
29-
import org.jkiss.dbeaver.model.data.DBDResultSetDataProvider;
30-
import org.jkiss.dbeaver.model.data.DBDRowIdentifier;
31-
import org.jkiss.dbeaver.model.data.DBDValueRow;
28+
import org.jkiss.dbeaver.model.data.*;
3229
import org.jkiss.dbeaver.model.data.hints.DBDValueHintContext;
3330
import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
3431
import org.jkiss.dbeaver.model.struct.DBSEntity;
@@ -122,9 +119,14 @@ public Object getCellValue(
122119
@NotNull DBDAttributeBinding attribute,
123120
@NotNull DBDValueRow row,
124121
@Nullable int[] rowIndexes,
122+
@Nullable ResultSetValuePath valuePath,
125123
boolean retrieveDeepestCollectionElement
126124
) throws DBWebException {
127-
return DBUtils.getAttributeValue(attribute, getAttributes(), row.getValues());
125+
if (valuePath != null) {
126+
return DBUtils.getRowValueByPath(row, valuePath);
127+
} else {
128+
return DBUtils.getAttributeValue(attribute, getAttributes(), row.getValues());
129+
}
128130
}
129131

130132
@Nullable

0 commit comments

Comments
 (0)