Merge 8c9654d into d3dfd6a

Author: vitstn

ydb/library/yql/parser/pg_catalog/catalog.cpp

@@ -2551,22 +2551,27 @@ TMaybe<TIssue> LookupCommonType(const TVector<ui32>& typeIds, const std::functio
 
     const auto& catalog = TCatalog::Instance();
 
-    const TTypeDesc* commonType = &LookupType(typeIds[0]);
-    char commonCategory = commonType->Category;
-    size_t unknownsCnt = (commonType->TypeId == UnknownOid) ? 1 : 0;
+    size_t unknownsCnt = (typeIds[0] == UnknownOid || typeIds[0] == InvalidOid) ? 1 : 0;
     castsNeeded = (unknownsCnt != 0);
+    const TTypeDesc* commonType = nullptr;
+    char commonCategory = 0;
+    if (typeIds[0] != InvalidOid) {
+        commonType = &LookupType(typeIds[0]);
+        commonCategory = commonType->Category;
+    }
+
     size_t i = 1;
     for (auto typeId = typeIds.cbegin() + 1; typeId != typeIds.cend(); ++typeId, ++i) {
         if (*typeId == UnknownOid || *typeId == InvalidOid) {
             ++unknownsCnt;
             castsNeeded = true;
             continue;
         }
-        if (Y_LIKELY(*typeId == commonType->TypeId)) {
+        if (commonType && *typeId == commonType->TypeId) {
             continue;
         }
         const TTypeDesc& otherType = LookupType(*typeId);
-        if (commonType->TypeId == UnknownOid) {
+        if (!commonType || commonType->TypeId == UnknownOid) {
             commonType = &otherType;
             commonCategory = otherType.Category;
             continue;

ydb/library/yql/parser/pg_wrapper/comp_factory.cpp

@@ -298,8 +298,10 @@ class TPgTableContent : public TMutableComputationNode<TPgTableContent> {
                     {"oid", [](const NPg::TTypeDesc& desc) { return ScalarDatumToPod(ObjectIdGetDatum(desc.TypeId)); }},
                     {"typname", [](const NPg::TTypeDesc& desc) { return PointerDatumToPod((Datum)(MakeFixedString(desc.Name, NAMEDATALEN))); }},
                     {"typinput", [](const NPg::TTypeDesc& desc) { return ScalarDatumToPod(ObjectIdGetDatum(desc.InFuncId)); }},
-                    {"typnamespace", [](const NPg::TTypeDesc& desc) { return ScalarDatumToPod(ObjectIdGetDatum(1)); }},
+                    {"typnamespace", [](const NPg::TTypeDesc& desc) { return ScalarDatumToPod(ObjectIdGetDatum(PG_CATALOG_NAMESPACE)); }},
                     {"typtype", [](const NPg::TTypeDesc& desc) { return ScalarDatumToPod(CharGetDatum(desc.TypType)); }},
+                    {"typrelid", [](const NPg::TTypeDesc&) { return ScalarDatumToPod(ObjectIdGetDatum(0)); }},
+                    {"typelem", [](const NPg::TTypeDesc& desc) { return ScalarDatumToPod(ObjectIdGetDatum(desc.ElementTypeId)); }},
                 };
 
                 ApplyFillers(AllPgTypeFillers, Y_ARRAY_SIZE(AllPgTypeFillers), PgTypeFillers_);

ydb/library/yql/sql/pg/pg_sql.cpp

@@ -3489,6 +3489,10 @@ class TConverter : public IPGParseEvents {
         }
 
         auto name = names.back();
+        if (name == "shobj_description" || name == "obj_description") {
+            AddWarning(TIssuesIds::PG_COMPAT, name + " function forced to NULL");
+            return L(A("Null"));
+        }
 
         const bool isAggregateFunc = NYql::NPg::HasAggregation(name, NYql::NPg::EAggKind::Normal);
         const bool hasReturnSet = NYql::NPg::HasReturnSetProc(name);