Merge e2cc51b into 6569863

Author: azevaykin

ydb/core/scheme/scheme_tablecell.cpp

@@ -487,9 +487,14 @@ void DbgPrintValue(TString &res, const TCell &r, NScheme::TTypeInfo typeInfo) {
         case NScheme::NTypeIds::ActorId:
             res += ToString(r.AsValue<NActors::TActorId>());
             break;
-        case NScheme::NTypeIds::Pg:
-            // TODO: support pg types
+        case NScheme::NTypeIds::Pg: {
+            auto convert = NPg::PgNativeTextFromNativeBinary(r.AsBuf(), typeInfo.GetTypeDesc());
+            if (!convert.Error)
+                res += convert.Str;
+            else
+                res += *convert.Error;
             break;
+            }
         default:
             res += EscapeC(r.Data(), r.Size());
         }

ydb/core/scheme/ut_pg/scheme_tablecell_pg_ut.cpp

@@ -0,0 +1,33 @@
+#include <library/cpp/testing/unittest/registar.h>
+
+#include <ydb/core/scheme/scheme_tablecell.h>
+#include <ydb/core/scheme/scheme_type_registry.h>
+
+extern "C" {
+#include "postgres.h"
+#include "catalog/pg_type_d.h"
+}
+
+namespace NKikimr {
+namespace NTable {
+
+Y_UNIT_TEST_SUITE(PgTest) {
+
+    Y_UNIT_TEST(DumpCells) {
+        NScheme::TTypeRegistry typeRegistry;
+
+        char strVal[] = "This is the value";
+        TCell strCell((const char*)&strVal, sizeof(strVal) - 1);
+
+        NScheme::TTypeInfo typeInfo(NScheme::TString::TypeId);
+        TString strRes = DbgPrintCell(strCell, typeInfo, typeRegistry);
+        UNIT_ASSERT_STRINGS_EQUAL(strRes, TStringBuilder() << "String : " << strVal);
+
+        NScheme::TTypeInfo pgTypeInfo(NScheme::NTypeIds::Pg, NPg::TypeDescFromPgTypeId(TEXTOID));
+        TString pgStrRes = DbgPrintCell(strCell, pgTypeInfo, typeRegistry);
+        UNIT_ASSERT_STRINGS_EQUAL(pgStrRes, TStringBuilder() << "pgtext : " << strVal);
+    }
+}
+
+}
+}

ydb/core/scheme/ut_pg/ya.make

@@ -0,0 +1,31 @@
+UNITTEST_FOR(ydb/core/scheme)
+
+FORK_SUBTESTS()
+
+SRCS(
+    scheme_tablecell_pg_ut.cpp
+)
+
+PEERDIR(
+    ydb/core/scheme
+    ydb/library/yql/public/udf/service/exception_policy
+    ydb/library/yql/parser/pg_wrapper
+)
+
+ADDINCL(
+    ydb/library/yql/parser/pg_wrapper/postgresql/src/include
+)
+
+IF (OS_WINDOWS)
+CFLAGS(
+   "-D__thread=__declspec(thread)"
+   -Dfstat=microsoft_native_fstat
+   -Dstat=microsoft_native_stat
+)
+ENDIF()
+
+NO_COMPILER_WARNINGS()
+
+YQL_LAST_ABI_VERSION()
+
+END()