From fad99cb2e01ad5e402d651eaa2e1cc1cc8c65f95 Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Thu, 7 Oct 2021 19:40:25 +0300 Subject: [PATCH] CB-1309 Document editor fix --- .../src/io/cloudbeaver/service/sql/WebSQLProcessor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 41ef54e949..5bb452d31e 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 @@ -419,7 +419,8 @@ public class WebSQLProcessor { } for (int i = 0; i < keyAttributes.length; i++) { DBDAttributeBinding keyAttribute = keyAttributes[i]; - if (keyAttributes.length == 1 && keyAttribute.getDataKind() == DBPDataKind.DOCUMENT && dataContainer instanceof DBSDocumentLocator) { + boolean isDocumentValue = keyAttributes.length == 1 && keyAttribute.getDataKind() == DBPDataKind.DOCUMENT && dataContainer instanceof DBSDocumentLocator; + if (isDocumentValue) { rowValues[updateAttributes.length + i] = makeDocumentInputValue(session, (DBSDocumentLocator) dataContainer, resultsInfo, row); } else { @@ -433,7 +434,7 @@ public class WebSQLProcessor { } if (ArrayUtils.contains(updateAttributes, keyAttribute)) { // Key attribute is already updated - } else { + } else if (!isDocumentValue) { finalRow[keyAttribute.getOrdinalPosition()] = rowValues[updateAttributes.length + i]; } }