[] Fix DqJoin type annotation for PG or NULL types

1 files changed, 1 insertions, 1 deletions

diff --git a/ydb/library/yql/dq/type_ann/dq_type_ann.cpp b/ydb/library/yql/dq/type_ann/dq_type_ann.cpp
index f4835abdad..7d8428140c 100644
--- a/ydb/library/yql/dq/type_ann/dq_type_ann.cpp
+++ b/ydb/library/yql/dq/type_ann/dq_type_ann.cpp
@@ -322,7 +322,7 @@ const TStructExprType* GetDqJoinResultType(TPositionHandle pos, const TStructExp
         for (const auto& it : type) {
             for (const auto& it2 : it.second) {
                 auto memberName = FullColumnName(it.first, it2.first);
-                if (makeOptional && it2.second->GetKind() != ETypeAnnotationKind::Optional) {
+                if (makeOptional && !it2.second->IsOptionalOrNull()) {
                     result->emplace_back(ctx.MakeType<TItemExprType>(memberName, ctx.MakeType<TOptionalExprType>(it2.second)));
                 } else {
                     result->emplace_back(ctx.MakeType<TItemExprType>(memberName, it2.second));