From 481e7ad945f52e992c7756ba67369d9ef7ea9a12 Mon Sep 17 00:00:00 2001 From: Alexander Skoblikov Date: Fri, 25 Feb 2022 18:41:14 +0300 Subject: [PATCH] CB-1679 display unknown types as string --- .../src/io/cloudbeaver/service/sql/WebSQLUtils.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java index ff04e3b877..868e15f8a4 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLUtils.java @@ -48,11 +48,13 @@ public class WebSQLUtils { public static Object makeWebCellValue(WebSession session, DBSTypedObject type, Object cellValue, WebDataFormat dataFormat) throws DBCException { if (type instanceof DBDAttributeBinding && - (cellValue instanceof Date || cellValue instanceof Number)) - { + (cellValue instanceof Date || cellValue instanceof Number)) { return ((DBDAttributeBinding) type).getValueHandler().getValueDisplayString(type, cellValue, DBDDisplayFormat.EDIT); } + if (cellValue instanceof Boolean) { + return cellValue; + } if (cellValue instanceof Date) { return CBConstants.ISO_DATE_FORMAT.format(cellValue); } else if (cellValue instanceof Number) { @@ -80,7 +82,7 @@ public class WebSQLUtils { return serializeContentValue(session, (DBDContent)dbValue); } } - return cellValue; + return cellValue == null ? null : cellValue.toString(); } private static Object serializeComplexValue(WebSession session, DBSTypedObject type, DBDComplexValue value, WebDataFormat dataFormat) throws DBCException {