Fix missed convertation for Tagged, Null, EmptyList and EmptyDict types.

2 files changed, 26 insertions, 3 deletions

diff --git a/ydb/core/kqp/provider/yql_kikimr_results.cpp b/ydb/core/kqp/provider/yql_kikimr_results.cpp
index 1e1c4ae7f3..39981ee14b 100644
--- a/ydb/core/kqp/provider/yql_kikimr_results.cpp
+++ b/ydb/core/kqp/provider/yql_kikimr_results.cpp
@@ -5,8 +5,6 @@
 #include <ydb/library/uuid/uuid.h>
 
 #include <ydb/library/yql/providers/common/codec/yql_codec_results.h>
-#include <ydb/library/yql/providers/common/provider/yql_provider.h>
-#include <ydb/library/yql/providers/common/schema/expr/yql_expr_schema.h>
 #include <ydb/library/yql/public/decimal/yql_decimal.h>
 
 namespace NYql {
@@ -479,6 +477,29 @@ bool ExportTypeToKikimrProto(const TTypeAnnotationNode& type, NKikimrMiniKQL::TT
             return true;
         }
 
+        case ETypeAnnotationKind::Null: {
+            protoType.SetKind(NKikimrMiniKQL::ETypeKind::Null);
+            return true;
+        }
+
+        case ETypeAnnotationKind::EmptyList: {
+            protoType.SetKind(NKikimrMiniKQL::ETypeKind::EmptyList);
+            return true;
+        }
+
+        case ETypeAnnotationKind::EmptyDict: {
+            protoType.SetKind(NKikimrMiniKQL::ETypeKind::EmptyDict);
+            return true;
+        }
+
+        case ETypeAnnotationKind::Tagged: {
+            auto taggedType = type.Cast<TTaggedExprType>();
+            protoType.SetKind(NKikimrMiniKQL::ETypeKind::Tagged);
+            auto target = protoType.MutableTagged();
+            target->SetTag(TString(taggedType->GetTag()));
+            return ExportTypeToKikimrProto(*taggedType->GetBaseType(), *target->MutableItem(), ctx);
+        }
+
         case ETypeAnnotationKind::Data: {
             protoType.SetKind(NKikimrMiniKQL::ETypeKind::Data);
             auto slot = type.Cast<TDataExprType>()->GetSlot();
diff --git a/ydb/core/kqp/query_compiler/kqp_query_compiler.cpp b/ydb/core/kqp/query_compiler/kqp_query_compiler.cpp
index b921dc630f..194be41faa 100644
--- a/ydb/core/kqp/query_compiler/kqp_query_compiler.cpp
+++ b/ydb/core/kqp/query_compiler/kqp_query_compiler.cpp
@@ -511,7 +511,9 @@ public:
 
             NKikimrMiniKQL::TType kikimrProto;
 
-            NYql::ExportTypeToKikimrProto(*type, kikimrProto, ctx);
+            if (!NYql::ExportTypeToKikimrProto(*type, kikimrProto, ctx)) {
+                return false;
+            }
 
             auto resultMeta = queryBindingProto.MutableResultSetMeta();