Remove bindings' crutch

2 files changed, 1 insertions, 59 deletions

diff --git a/ydb/core/kqp/host/kqp_host.cpp b/ydb/core/kqp/host/kqp_host.cpp
index b7da42e058..07d0ee50af 100644
--- a/ydb/core/kqp/host/kqp_host.cpp
+++ b/ydb/core/kqp/host/kqp_host.cpp
@@ -26,8 +26,6 @@
 #include <library/cpp/random_provider/random_provider.h>
 #include <library/cpp/time_provider/time_provider.h>
 
-#include <util/system/env.h>
-
 namespace NKikimr {
 namespace NKqp {
 
@@ -1057,19 +1055,6 @@ private:
         TAstParseResult astRes;
         if (isSql) {
             NSQLTranslation::TTranslationSettings settings{};
-
-            // TODO: remove this test crutch when dynamic bindings discovery will be implemented // YQ-1964
-            if ((SessionCtx->Query().Type == EKikimrQueryType::Script || SessionCtx->Query().Type == EKikimrQueryType::Query) && GetEnv("TEST_S3_CONNECTION")) {
-                NSQLTranslation::TTableBindingSettings binding;
-                binding.ClusterType = "s3";
-                binding.Settings["cluster"] = GetEnv("TEST_S3_CONNECTION");
-                binding.Settings["path"] = GetEnv("TEST_S3_OBJECT");
-                binding.Settings["format"] = GetEnv("TEST_S3_FORMAT");
-                binding.Settings["schema"] = GetEnv("TEST_S3_SCHEMA");
-
-                settings.Bindings[GetEnv("TEST_S3_BINDING")] = binding;
-            }
-
             if (sqlVersion) {
                 settings.SyntaxVersion = *sqlVersion;
 
@@ -1483,14 +1468,7 @@ private:
         state->FunctionRegistry = FuncRegistry;
         state->CredentialsFactory = nullptr; // TODO
 
-        // TODO: remove this test crutch after dynamic connections resolving implementation // YQ-1964
         NYql::TS3GatewayConfig cfg;
-        if (GetEnv("TEST_S3_CONNECTION")) {
-            auto* mapping = cfg.AddClusterMapping();
-            mapping->SetName(GetEnv("TEST_S3_CONNECTION"));
-            mapping->SetUrl(TStringBuilder() << GetEnv("S3_ENDPOINT") << "/" << GetEnv("TEST_S3_BUCKET") << "/");
-        }
-
         state->Configuration->Init(cfg, TypesCtx);
 
         auto dataSource = NYql::CreateS3DataSource(state, HttpGateway);
diff --git a/ydb/core/kqp/ut/federated_query/kqp_federated_query_ut.cpp b/ydb/core/kqp/ut/federated_query/kqp_federated_query_ut.cpp
index 6e6bd8c7ce..55a02670d2 100644
--- a/ydb/core/kqp/ut/federated_query/kqp_federated_query_ut.cpp
+++ b/ydb/core/kqp/ut/federated_query/kqp_federated_query_ut.cpp
@@ -81,43 +81,6 @@ NYdb::NQuery::TScriptExecutionOperation WaitScriptExecutionOperation(const NYdb:
 }
 
 Y_UNIT_TEST_SUITE(KqpFederatedQuery) {
-    Y_UNIT_TEST(ExecuteScript) {
-        CreateBucketWithObject("test_bucket", "Root/test_object", TEST_CONTENT);
-        SetEnv("TEST_S3_BUCKET", "test_bucket");
-        SetEnv("TEST_S3_OBJECT", "test_object");
-        SetEnv("TEST_S3_CONNECTION", "test_connection");
-        SetEnv("TEST_S3_BINDING", "test_binding");
-        SetEnv("TEST_S3_FORMAT", "json_each_row");
-        SetEnv("TEST_S3_SCHEMA", TEST_SCHEMA);
-
-        auto kikimr = DefaultKikimrRunner();
-        auto db = kikimr.GetQueryClient();
-
-        auto scriptExecutionOperation = db.ExecuteScript(R"(
-            PRAGMA s3.AtomicUploadCommit = "1";  --Check that pragmas are OK
-            SELECT * FROM bindings.test_binding;
-        )").ExtractValueSync();
-        UNIT_ASSERT_VALUES_EQUAL_C(scriptExecutionOperation.Status().GetStatus(), EStatus::SUCCESS, scriptExecutionOperation.Status().GetIssues().ToString());
-        UNIT_ASSERT(scriptExecutionOperation.Metadata().ExecutionId);
-
-        NYdb::NQuery::TScriptExecutionOperation readyOp = WaitScriptExecutionOperation(scriptExecutionOperation.Id(), kikimr.GetDriver());
-        UNIT_ASSERT_EQUAL(readyOp.Metadata().ExecStatus, EExecStatus::Completed);
-        TFetchScriptResultsResult results = db.FetchScriptResults(scriptExecutionOperation.Metadata().ExecutionId).ExtractValueSync();
-        UNIT_ASSERT_C(results.IsSuccess(), results.GetIssues().ToString());
-
-        TResultSetParser resultSet(results.ExtractResultSet());
-        UNIT_ASSERT_VALUES_EQUAL(resultSet.ColumnsCount(), 2);
-        UNIT_ASSERT_VALUES_EQUAL(resultSet.RowsCount(), 2);
-
-        UNIT_ASSERT(resultSet.TryNextRow());
-        UNIT_ASSERT_VALUES_EQUAL(resultSet.ColumnParser(0).GetUtf8(), "1");
-        UNIT_ASSERT_VALUES_EQUAL(resultSet.ColumnParser(1).GetUtf8(), "trololo");
-
-        UNIT_ASSERT(resultSet.TryNextRow());
-        UNIT_ASSERT_VALUES_EQUAL(resultSet.ColumnParser(0).GetUtf8(), "2");
-        UNIT_ASSERT_VALUES_EQUAL(resultSet.ColumnParser(1).GetUtf8(), "hello world");
-    }
-
     Y_UNIT_TEST(ExecuteScriptWithExternalTableResolve) {
         using namespace fmt::literals;
         const TString externalDataSourceName = "/Root/external_data_source";
@@ -155,6 +118,7 @@ Y_UNIT_TEST_SUITE(KqpFederatedQuery) {
         UNIT_ASSERT_C(result.GetStatus() == NYdb::EStatus::SUCCESS, result.GetIssues().ToString());
 
         const TString sql = fmt::format(R"(
+                PRAGMA s3.AtomicUploadCommit = "1";  --Check that pragmas are OK
                 SELECT * FROM `{external_table}`
             )", "external_table"_a=externalTableName);