use single bindings collection in sql translator

5 files changed, 7 insertions, 10 deletions

diff --git a/ydb/core/fq/libs/actors/table_bindings_from_bindings.cpp b/ydb/core/fq/libs/actors/table_bindings_from_bindings.cpp
index 005b075b825..83d257a8f84 100644
--- a/ydb/core/fq/libs/actors/table_bindings_from_bindings.cpp
+++ b/ydb/core/fq/libs/actors/table_bindings_from_bindings.cpp
@@ -84,8 +84,7 @@ void FillBinding(NSQLTranslation::TTranslationSettings& sqlSettings, const Feder
         bindSettings.Settings["partitioned_by"] = partitionedBy.ToJsonPretty();
     }
 
-    // todo: use visibility to fill either PrivateBindings or ScopedBindings
-    sqlSettings.PrivateBindings[binding.content().name()] = std::move(bindSettings);
+    sqlSettings.Bindings[binding.content().name()] = std::move(bindSettings);
 }
 
 } //namespace
diff --git a/ydb/core/kqp/host/kqp_host.cpp b/ydb/core/kqp/host/kqp_host.cpp
index b77525cba30..0ca852010bf 100644
--- a/ydb/core/kqp/host/kqp_host.cpp
+++ b/ydb/core/kqp/host/kqp_host.cpp
@@ -1067,7 +1067,7 @@ private:
                 binding.Settings["format"] = GetEnv("TEST_S3_FORMAT");
                 binding.Settings["schema"] = GetEnv("TEST_S3_SCHEMA");
 
-                settings.PrivateBindings[GetEnv("TEST_S3_BINDING")] = binding;
+                settings.Bindings[GetEnv("TEST_S3_BINDING")] = binding;
             }
 
             if (sqlVersion) {
diff --git a/ydb/library/yql/sql/settings/partitioning.cpp b/ydb/library/yql/sql/settings/partitioning.cpp
index adc65973dba..c40036f5310 100644
--- a/ydb/library/yql/sql/settings/partitioning.cpp
+++ b/ydb/library/yql/sql/settings/partitioning.cpp
@@ -38,14 +38,13 @@ TString ParsePartitionedByBinding(const TString& name, const TString& value, TVe
 }
 
 TString ExtractBindingInfo(const TTranslationSettings& settings, const TString& binding, TBindingInfo& result) {
-    auto pit = settings.PrivateBindings.find(binding);
-    auto sit = settings.ScopedBindings.find(binding);
+    auto pit = settings.Bindings.find(binding);
 
-    if (pit == settings.PrivateBindings.end() && sit == settings.ScopedBindings.end()) {
+    if (pit == settings.Bindings.end()) {
         return TStringBuilder() << "Table binding `" << binding << "` is not defined";
     }
 
-    const auto& bindSettings = (pit != settings.PrivateBindings.end()) ? pit->second : sit->second;
+    const auto& bindSettings = pit->second;
 
     if (!IsIn({NYql::S3ProviderName, NYql::PqProviderName}, bindSettings.ClusterType)) {
         return TStringBuilder() << "Cluster type " << bindSettings.ClusterType << " is not supported for table bindings";
diff --git a/ydb/library/yql/sql/settings/translation_settings.h b/ydb/library/yql/sql/settings/translation_settings.h
index f17c50ddc3c..fb84b74cb21 100644
--- a/ydb/library/yql/sql/settings/translation_settings.h
+++ b/ydb/library/yql/sql/settings/translation_settings.h
@@ -65,8 +65,7 @@ namespace NSQLTranslation {
         THashSet<TString> Libraries;
         THashSet<TString> Flags;
 
-        THashMap<TString, TTableBindingSettings> PrivateBindings;
-        THashMap<TString, TTableBindingSettings> ScopedBindings;
+        THashMap<TString, TTableBindingSettings> Bindings;
 
         // each (name, type) entry in this map is equivalent to
         // DECLARE $name AS type;
diff --git a/ydb/library/yql/sql/v1/sql_ut.cpp b/ydb/library/yql/sql/v1/sql_ut.cpp
index 10d7d4facf5..6fb8e0db8b4 100644
--- a/ydb/library/yql/sql/v1/sql_ut.cpp
+++ b/ydb/library/yql/sql/v1/sql_ut.cpp
@@ -187,7 +187,7 @@ NSQLTranslation::TTranslationSettings GetSettingsWithS3Binding(const TString& na
                             ]
     ]])__";
     bindSettings.Settings["partitioned_by"] = "[\"key\", \"subkey\"]";
-    settings.PrivateBindings[name] = bindSettings;
+    settings.Bindings[name] = bindSettings;
     return settings;
 }