Skip to content

Commit 4434f3b

Browse files
authored
YDB FQ: fix YDB CP storage connections test (#6775)
1 parent db4c9b2 commit 4434f3b

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

ydb/core/fq/libs/control_plane_storage/message_builders.h

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,8 @@ class TCreateConnectionBuilder {
455455
const TString& databaseId,
456456
const TString& login,
457457
const TString& password,
458-
const TString& serviceAccount)
458+
const TString& serviceAccount,
459+
const TString& databaseName)
459460
{
460461
// auto& ch = *Request.mutable_content()->mutable_setting()->mutable_clickhouse_cluster();
461462
if (serviceAccount) {
@@ -467,19 +468,22 @@ class TCreateConnectionBuilder {
467468
conn.set_database_id(databaseId);
468469
conn.set_login(login);
469470
conn.set_password(password);
471+
conn.set_database_name(databaseName);
470472
return *this;
471473
}
472474

473-
TCreateConnectionBuilder& CreateClickHouse(const TString& databaseId, const TString& login, const TString& password, const TString& serviceAccount)
475+
TCreateConnectionBuilder& CreateClickHouse(
476+
const TString& databaseId, const TString& login, const TString& password, const TString& serviceAccount, const TString& databaseName)
474477
{
475478
auto& conn = *Request.mutable_content()->mutable_setting()->mutable_clickhouse_cluster();
476-
return CreateGeneric(conn, databaseId, login, password, serviceAccount);
479+
return CreateGeneric(conn, databaseId, login, password, serviceAccount, databaseName);
477480
}
478481

479-
TCreateConnectionBuilder& CreatePostgreSQL(const TString& databaseId, const TString& login, const TString& password, const TString& serviceAccount)
482+
TCreateConnectionBuilder& CreatePostgreSQL(
483+
const TString& databaseId, const TString& login, const TString& password, const TString& serviceAccount, const TString& databaseName)
480484
{
481485
auto& conn = *Request.mutable_content()->mutable_setting()->mutable_postgresql_cluster();
482-
return CreateGeneric(conn, databaseId, login, password, serviceAccount);
486+
return CreateGeneric(conn, databaseId, login, password, serviceAccount, databaseName);
483487
}
484488

485489
TCreateConnectionBuilder& CreateObjectStorage(const TString& bucket, const TString& serviceAccount)

ydb/tests/fq/control_plane_storage/ydb_control_plane_storage_connections_ut.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,8 @@ Y_UNIT_TEST_SUITE(TYdbControlPlaneStorageDescribeConnection) {
552552
TTestBootstrap bootstrap{__PRETTY_FUNCTION__};
553553
TString connectionId;
554554
{
555-
const auto [result, issues] = bootstrap.CreateConnection(TCreateConnectionBuilder{}.CreateClickHouse("my_db", "my_login", "my_pswd", "").Build());
555+
const auto [result, issues] = bootstrap.CreateConnection(TCreateConnectionBuilder{}.CreateClickHouse(
556+
"my_db", "my_login", "my_pswd", "", "database_name").Build());
556557
UNIT_ASSERT_C(!issues, issues.ToString());
557558
connectionId = result.connection_id();
558559
}
@@ -574,10 +575,10 @@ void TestShouldNotShowPassword(NYql::EDatabaseType databaseType) {
574575
TCreateConnectionBuilder connBuilder{};
575576
switch(databaseType) {
576577
case NYql::EDatabaseType::ClickHouse:
577-
request = connBuilder.CreateClickHouse("my_db", "my_login", "my_pswd", "").Build();
578+
request = connBuilder.CreateClickHouse("my_db", "my_login", "my_pswd", "", "database_name").Build();
578579
break;
579580
case NYql::EDatabaseType::PostgreSQL:
580-
request = connBuilder.CreatePostgreSQL("my_db", "my_login", "my_pswd", "").Build();
581+
request = connBuilder.CreatePostgreSQL("my_db", "my_login", "my_pswd", "", "database_name").Build();
581582
break;
582583
default:
583584
ythrow yexception() << TStringBuilder() << "unexpected database type: " << NYql::DatabaseTypeToMdbUrlPath(databaseType);

0 commit comments

Comments
 (0)