Merge branch 'devel' into CB-4922-2508-update-duck-db-driver-to-0-10

dbeaver · May 7, 2024 · ab0d850 · ab0d850
2 parents 4cb827d + c0bbe7f
commit ab0d850
Showing 1 changed file with 3 additions and 4 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
@@ -16,7 +16,6 @@
  */
 package io.cloudbeaver.service.sql;
 
-import com.google.gson.internal.LinkedTreeMap;
 import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.model.WebConnectionInfo;
 import io.cloudbeaver.model.session.WebSession;
@@ -667,7 +666,7 @@ private DBSDataManipulator generateUpdateResultsDataBatch(
                     for (int i = 0; i < allAttributes.length; i++) {
                         if (addedValues[i] != null) {
                             Object realCellValue;
-                            if (addedValues[i] instanceof LinkedTreeMap variables) {
+                            if (addedValues[i] instanceof Map<?, ?> variables) {
                                 realCellValue = setCellRowValue(variables, webSession, session, allAttributes[i], withoutExecution);
                             } else {
                                 realCellValue = convertInputCellValue(session, allAttributes[i],
@@ -1140,8 +1139,8 @@ private static DBCExecutionPurpose resolveQueryPurpose(DBDDataFilter filter) {
     }
 
     private Object setCellRowValue(Object cellRow, WebSession webSession, DBCSession dbcSession, DBDAttributeBinding allAttributes, boolean withoutExecution) {
-        if (cellRow instanceof LinkedTreeMap) {
-            LinkedTreeMap<String, Object> variables = (LinkedTreeMap<String, Object>) cellRow;
+        if (cellRow instanceof Map<?, ?>) {
+            Map<String, Object> variables = (Map<String, Object>) cellRow;
             if (variables.get(FILE_ID) != null) {
                 Path path = CBPlatform.getInstance()
                     .getTempFolder(webSession.getProgressMonitor(), TEMP_FILE_FOLDER)