Skip to content

dbeaver/pro#7693 added key attributes row id check #4019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yagudin10 merged 4 commits into from
Dec 29, 2025
Merged

dbeaver/pro#7693 added key attributes row id check #4019

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15f4c51
dbeaver/pro#7693 added key attributes row id check
Nexus6v2 Dec 25, 2025
4425a30
Merge branch 'devel' into dbeaver/pro#7693-jsonb-string-value-fix
dariamarutkina Dec 26, 2025
cf40178
dbeaver/pro#7693 added fix for single row tables
Nexus6v2 Dec 26, 2025
c86b7c0
Merge branch 'devel' into dbeaver/pro#7693-jsonb-string-value-fix
dariamarutkina Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ private void readCellDataValue(
DBCExecutionContext executionContext = getExecutionContext(dataContainer);
try (DBCSession session = executionContext.openSession(monitor, DBCExecutionPurpose.USER, "Generate data update batches")) {
DBDDataFilter dataFilter = new DBDDataFilter();
addKeyAttributes(resultsInfo, row, dataContainer, session, dataFilter);
addKeyAttributes(monitor, resultsInfo, row, dataContainer, session, dataFilter);
WebExecutionSource executionSource = new WebExecutionSource(dataContainer, executionContext, this);
dataContainer.readData(
executionSource, session, dataReceiver, dataFilter,
Expand All @@ -960,16 +960,21 @@ private void readCellDataValue(
}

private void addKeyAttributes(
@NotNull DBRProgressMonitor monitor,
@NotNull WebSQLResultsInfo resultsInfo,
@NotNull WebSQLResultsRow row,
@NotNull DBSDataContainer dataContainer,
@NotNull DBCSession session,
@NotNull DBDDataFilter dataFilter
) throws DBException {
DBDRowIdentifier rowIdentifier = resultsInfo.getDefaultRowIdentifier();
if (rowIdentifier == null || rowIdentifier.isIncomplete()) {
return;
if (resultsInfo.isSingleRow()) {
long rowCount = DBUtils.readRowCount(monitor, session.getExecutionContext(), dataContainer, null, this);
if (rowCount == 1) {
return;
}
}
DBDRowIdentifier rowIdentifier = resultsInfo.getDefaultRowIdentifier();
checkRowIdentifier(resultsInfo, rowIdentifier);
DBDAttributeBinding[] keyAttributes = rowIdentifier.getAttributes().toArray(new DBDAttributeBinding[0]);
Object[] rowValues = new Object[keyAttributes.length];
List<DBDAttributeConstraint> constraints = new ArrayList<>();
Expand Down
Loading