Intermediate changes

commit_hash:b7af32a044e61298c718faab65887c6d8725b4c8

2 files changed, 12 insertions, 2 deletions

diff --git a/yql/tools/yqlrun/ya.make b/yql/tools/yqlrun/ya.make
index ead4aec04cc..c83d16312a5 100644
--- a/yql/tools/yqlrun/ya.make
+++ b/yql/tools/yqlrun/ya.make
@@ -38,7 +38,9 @@ PEERDIR(
     yql/essentials/minikql
     yql/essentials/protos
     yql/essentials/ast
+    yql/essentials/sql
     yql/essentials/sql/pg
+    yql/essentials/sql/v1
 
     library/cpp/getopt
     library/cpp/logger
diff --git a/yql/tools/yqlrun/yqlrun.cpp b/yql/tools/yqlrun/yqlrun.cpp
index 827c9a13c39..936357fe8b9 100644
--- a/yql/tools/yqlrun/yqlrun.cpp
+++ b/yql/tools/yqlrun/yqlrun.cpp
@@ -23,6 +23,8 @@
 #include <yql/essentials/core/yql_udf_index.h>
 #include <yql/essentials/core/yql_library_compiler.h>
 #include <yql/essentials/ast/yql_expr.h>
+#include <yql/essentials/sql/sql.h>
+#include <yql/essentials/sql/v1/sql.h>
 
 #include <library/cpp/getopt/last_getopt.h>
 #include <library/cpp/logger/stream.h>
@@ -207,6 +209,12 @@ int RunUI(int argc, const char* argv[])
 
     CommonInit(res, udfResolverPath, udfResolverFilterSyscalls, udfsPaths, fileStorage, udfResolver, funcRegistry, udfIndex);
 
+    NSQLTranslation::TTranslators translators(
+        nullptr,
+        NSQLTranslationV1::MakeTranslator(),
+        NSQLTranslationPG::MakeTranslator()
+    );
+
     TExprContext ctx;
     ctx.NextUniqueId = NPg::GetSqlLanguageParser()->GetContext().NextUniqueId;
     IModuleResolver::TPtr moduleResolver;
@@ -216,13 +224,13 @@ int RunUI(int argc, const char* argv[])
         Y_ABORT_UNLESS(mount);
         FillUserDataTableFromFileSystem(*mount, userData);
 
-        if (!CompileLibraries(userData, ctx, modules)) {
+        if (!CompileLibraries(translators, userData, ctx, modules)) {
             Cerr << "Errors on compile libraries:" << Endl;
             ctx.IssueManager.GetIssues().PrintTo(Cerr);
             return -1;
         }
 
-        moduleResolver = std::make_shared<TModuleResolver>(std::move(modules), ctx.NextUniqueId, clusterMapping, sqlFlags);
+        moduleResolver = std::make_shared<TModuleResolver>(translators, std::move(modules), ctx.NextUniqueId, clusterMapping, sqlFlags);
     } else {
         if (!GetYqlDefaultModuleResolver(ctx, moduleResolver, clusterMapping)) {
             Cerr << "Errors loading default YQL libraries:" << Endl;