Merge e6c52fc into 11e4668

Author: MrLolthe1st

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

@@ -2549,7 +2549,11 @@ class TConverter : public IPGParseEvents {
         return true;
     }
 
-    TString ResolveCluster(const TStringBuf schemaname) {
+    TString ResolveCluster(const TStringBuf schemaname, TString name) {
+        if (NYql::NPg::GetStaticColumns().contains(NPg::TTableInfoKey{"pg_catalog", name})) {
+            return "pg_catalog";
+        }
+
         if (schemaname == "public") {
             return "";
         }
@@ -2603,7 +2607,7 @@ class TConverter : public IPGParseEvents {
         return {};
       }
 
-      const auto cluster = ResolveCluster(schemaname);
+      const auto cluster = ResolveCluster(schemaname, TString(relname));
       const auto sinkOrSource = BuildClusterSinkOrSourceExpression(isSink, cluster);
       const auto key = BuildTableKeyExpression(relname, cluster, isScheme);
       return {sinkOrSource, key};
@@ -2630,7 +2634,7 @@ class TConverter : public IPGParseEvents {
             return {};
         }
 
-        const auto cluster = ResolveCluster(schemaname);
+        const auto cluster = ResolveCluster(schemaname, TString(objectName));
         const auto sinkOrSource = BuildClusterSinkOrSourceExpression(true, cluster);
         const auto key = BuildPgObjectExpression(objectName, pgObjectType);
         return {sinkOrSource, key};

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

@@ -516,61 +516,5 @@ from pg_catalog.pg_type)",
             settings);
         UNIT_ASSERT(res.IsOk());
         UNIT_ASSERT(res.Root);
-
-        res = SqlToYqlWithMode(
-            R"(select set_config('search_path', 'yql', false);)",
-            NSQLTranslation::ESqlMode::QUERY,
-            10,
-            {},
-            EDebugOutput::None,
-            false,
-            settings);
-        UNIT_ASSERT(!res.IsOk());
-        UNIT_ASSERT(!res.Root);
-
-        res = SqlToYqlWithMode(
-            R"(select set_config('search_path', 'pg_catalog', false);)",
-            NSQLTranslation::ESqlMode::QUERY,
-            10,
-            {},
-            EDebugOutput::None,
-            false,
-            settings);
-        UNIT_ASSERT(res.IsOk());
-        UNIT_ASSERT(res.Root);
-
-        res = SqlToYqlWithMode(
-            R"(rollback;)",
-            NSQLTranslation::ESqlMode::QUERY,
-            10,
-            {},
-            EDebugOutput::None,
-            false,
-            settings);
-        UNIT_ASSERT(res.IsOk());
-        UNIT_ASSERT(res.Root);
-
-        google::protobuf::Arena arena;
-        const auto service = TString(NYql::YtProviderName);
-        settings.ClusterMapping["hahn"] = NYql::YtProviderName;
-        settings.ClusterMapping["mon"] = NYql::SolomonProviderName;
-        settings.MaxErrors = 10;
-        settings.Mode = NSQLTranslation::ESqlMode::QUERY;
-        settings.Arena = &arena;
-        settings.AnsiLexer = false;
-        settings.SyntaxVersion = 1;
-        settings.PgParser = true;
-
-        res = SqlToYql(
-            R"(select oid,
-typinput::int4 as typinput,
-typname,
-typnamespace,
-typtype
-from pg_type)",
-            settings);
-        UNIT_ASSERT(res.Issues.ToString().Contains("Unknown cluster:"));
-        UNIT_ASSERT(!res.IsOk());
-        UNIT_ASSERT(!res.Root);
     }
 }