Merge branch 'devel' of https://github.com/dbeaver/cloudbeaver into devel

server/bundles/io.cloudbeaver.server/plugin.xml

@@ -40,5 +40,8 @@
     <extension point="org.jkiss.dbeaver.dataSourceHandler">
         <handler id="db.access.check" class="io.cloudbeaver.model.WebDatasourceAccessCheckHandler"/>
     </extension>
+    <extension point="io.cloudbeaver.valueSerializer">
+        <serializer type="geometry" class="io.cloudbeaver.server.data.WebGeometryValueSerializer"/>
+    </extension>
 
 </plugin>

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/data/WebGeometryValueSerializer.java

@@ -0,0 +1,44 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2022 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.cloudbeaver.server.data;
+
+import io.cloudbeaver.service.sql.DBWValueSerializer;
+import io.cloudbeaver.service.sql.WebSQLConstants;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.model.exec.DBCException;
+import org.jkiss.dbeaver.model.exec.DBCSession;
+import org.jkiss.dbeaver.model.gis.DBGeometry;
+import org.jkiss.dbeaver.model.struct.DBSTypedObject;
+import org.jkiss.utils.CommonUtils;
+
+import java.util.Map;
+
+public class WebGeometryValueSerializer implements DBWValueSerializer<DBGeometry> {
+    @NotNull
+    @Override
+    public DBGeometry deserializeValue(
+        @NotNull DBCSession session,
+        DBSTypedObject attribute,
+        @NotNull Map<String, Object> webValue
+    ) throws DBCException {
+        return new DBGeometry(
+            webValue.get(WebSQLConstants.ATTR_TEXT),
+            CommonUtils.toInt(webValue.get(WebSQLConstants.ATTR_SRID)),
+            (Map<String, Object>) webValue.get(WebSQLConstants.ATTR_PROPERTIES));
+    }
+}

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java

@@ -479,7 +479,7 @@ public class WebSQLProcessor implements WebSessionProvider {
                             Object realCellValue = convertInputCellValue(session, allAttributes[i],
                                 addedValues.get(i), withoutExecution);
                             insertAttributes.put(allAttributes[i], realCellValue);
-                            finalRow[i] = WebSQLUtils.makeWebCellValue(webSession, null, realCellValue, dataFormat);
+                            finalRow[i] = realCellValue;
                         }
                     }