Merge b761f9c into f1d756b

ydb-platform · Oct 23, 2024 · 7cececa · 7cececa
2 parents f1d756b + b761f9c
commit 7cececa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ydb/core/tablet_flat/flat_executor_db_mon.cpp b/ydb/core/tablet_flat/flat_executor_db_mon.cpp
@@ -238,7 +238,7 @@ class TExecutor::TTxExecutorDbMon : public TTransactionBase<TExecutor> {
                                         }
                                         case NScheme::NTypeIds::Pg: {
                                             auto convert = NPg::PgNativeTextFromNativeBinary(tuple.Columns[i].AsBuf(), tuple.Types[i].GetPgTypeDesc());
-                                            str << (!convert.Error ? convert.Str : *convert.Error);
+                                            str << EncodeHtmlPcdata(!convert.Error ? convert.Str : *convert.Error);
                                             break;
                                         }
                                         default:

diff --git a/ydb/core/viewer/viewer_tabletinfo.h b/ydb/core/viewer/viewer_tabletinfo.h
@@ -181,7 +181,7 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
         case NScheme::NTypeIds::Pg: {
             NScheme::TTypeInfo typeInfo = NKikimr::NScheme::TypeInfoFromProto(type.GetTypeId(), type.GetTypeInfo());
             auto convert = NPg::PgNativeTextFromNativeBinary(cell.AsBuf(),typeInfo.GetPgTypeDesc());
-            return !convert.Error ? convert.Str : *convert.Error;
+            return TStringBuilder() << '"' << (!convert.Error ? convert.Str : *convert.Error) << '"';;
         }        
         case NScheme::NTypeIds::DyNumber:        return "DyNumber";
         case NScheme::NTypeIds::Uuid:            return "Uuid";