diff options
| author | vitalyisaev <vitalyisaev@ydb.tech> | 2023-09-16 21:27:57 +0300 |
|---|---|---|
| committer | vitalyisaev <vitalyisaev@ydb.tech> | 2023-09-16 21:45:20 +0300 |
| commit | d6c30abe1681f3df2856f9eea39ed5f500326cc6 (patch) | |
| tree | ac6ae45e469597d13128a435d06fae3358994488 | |
| parent | af32cc2d55c2cc5975144c3d52ad91b6af2484a4 (diff) | |
| download | ydb-d6c30abe1681f3df2856f9eea39ed5f500326cc6.tar.gz | |
YQ Connector: avoid DATABASE_NAME validation
1. Поправлено заполнение параметров в соединении с PG
2. `DATABASE_NAME` временно сделано опциональным полем
| -rw-r--r-- | ydb/core/fq/libs/control_plane_proxy/actors/query_utils.cpp | 4 | ||||
| -rw-r--r-- | ydb/library/yql/providers/generic/provider/yql_generic_cluster_config.cpp | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/ydb/core/fq/libs/control_plane_proxy/actors/query_utils.cpp b/ydb/core/fq/libs/control_plane_proxy/actors/query_utils.cpp index 734f5e03a22..d45c7789a37 100644 --- a/ydb/core/fq/libs/control_plane_proxy/actors/query_utils.cpp +++ b/ydb/core/fq/libs/control_plane_proxy/actors/query_utils.cpp @@ -213,8 +213,8 @@ TString MakeCreateExternalDataSourceQuery( PROTOCOL="NATIVE", USE_TLS="true" )", - "mdb_cluster_id"_a = EncloseAndEscapeString(connectionContent.setting().clickhouse_cluster().database_id(), '"'), - "database_name"_a = EncloseAndEscapeString(connectionContent.setting().clickhouse_cluster().database_name(), '"')); + "mdb_cluster_id"_a = EncloseAndEscapeString(connectionContent.setting().postgresql_cluster().database_id(), '"'), + "database_name"_a = EncloseAndEscapeString(connectionContent.setting().postgresql_cluster().database_name(), '"')); break; } diff --git a/ydb/library/yql/providers/generic/provider/yql_generic_cluster_config.cpp b/ydb/library/yql/providers/generic/provider/yql_generic_cluster_config.cpp index 7be541c1bca..0f55422bafb 100644 --- a/ydb/library/yql/providers/generic/provider/yql_generic_cluster_config.cpp +++ b/ydb/library/yql/providers/generic/provider/yql_generic_cluster_config.cpp @@ -108,12 +108,14 @@ namespace NYql { auto it = properties.find("database_name"); if (it == properties.cend()) { // TODO: make this property required during https://st.yandex-team.ru/YQ-2184 - // ythrow yexception() << "field 'DATABASE_NAME' is currently ignored"; + // ythrow yexception() << "missing 'DATABASE_NAME' value"; return; } if (!it->second) { - ythrow yexception() << "invalid 'DATABASE_NAME' value: '" << it->second << "'"; + // TODO: make this property required during https://st.yandex-team.ru/YQ-2184 + // ythrow yexception() << "invalid 'DATABASE_NAME' value: '" << it->second << "'"; + return; } clusterConfig.SetDatabaseName(it->second); |