aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhcpp <hcpp@ydb.tech>2023-10-05 19:17:15 +0300
committerhcpp <hcpp@ydb.tech>2023-10-05 20:00:11 +0300
commit3d570e3d169572e58569f1ab96b039b9c949862e (patch)
tree82baeafb3740106cd07236a68e62fb13cb5dbd44
parent4b6ad89d8b3d7e73e4286ee2a5bc63fc22f4a578 (diff)
downloadydb-3d570e3d169572e58569f1ab96b039b9c949862e.tar.gz
schema for pg has been added
-rw-r--r--ydb/core/external_sources/external_source_factory.cpp2
-rw-r--r--ydb/core/kqp/gateway/behaviour/external_data_source/manager.cpp3
-rw-r--r--ydb/core/kqp/provider/yql_kikimr_gateway_ut.cpp4
3 files changed, 6 insertions, 3 deletions
diff --git a/ydb/core/external_sources/external_source_factory.cpp b/ydb/core/external_sources/external_source_factory.cpp
index 6a8c5cf889a..a54602602bf 100644
--- a/ydb/core/external_sources/external_source_factory.cpp
+++ b/ydb/core/external_sources/external_source_factory.cpp
@@ -41,7 +41,7 @@ IExternalSourceFactory::TPtr CreateExternalSourceFactory() {
},
{
ToString(NYql::NConnector::EExternalDataSource::PostgreSQL),
- CreateExternalDataSource(TString{NYql::GenericProviderName}, {"MDB_BASIC", "BASIC"}, {"database_name", "protocol", "mdb_cluster_id", "use_tls"})
+ CreateExternalDataSource(TString{NYql::GenericProviderName}, {"MDB_BASIC", "BASIC"}, {"database_name", "protocol", "mdb_cluster_id", "use_tls", "schema"})
}
});
}
diff --git a/ydb/core/kqp/gateway/behaviour/external_data_source/manager.cpp b/ydb/core/kqp/gateway/behaviour/external_data_source/manager.cpp
index 384a0e77b5e..d88999b068b 100644
--- a/ydb/core/kqp/gateway/behaviour/external_data_source/manager.cpp
+++ b/ydb/core/kqp/gateway/behaviour/external_data_source/manager.cpp
@@ -55,7 +55,8 @@ void FillCreateExternalDataSourceDesc(NKikimrSchemeOp::TExternalDataSourceDescri
"database_name",
"protocol",
"mdb_cluster_id",
- "use_tls"
+ "use_tls",
+ "schema"
};
for (const auto& property: properties) {
diff --git a/ydb/core/kqp/provider/yql_kikimr_gateway_ut.cpp b/ydb/core/kqp/provider/yql_kikimr_gateway_ut.cpp
index 22925a82ae7..39d942af588 100644
--- a/ydb/core/kqp/provider/yql_kikimr_gateway_ut.cpp
+++ b/ydb/core/kqp/provider/yql_kikimr_gateway_ut.cpp
@@ -475,6 +475,7 @@ Y_UNIT_TEST_SUITE(KikimrIcGateway) {
MDB_CLUSTER_ID="my_id",
DATABASE_NAME="my_db",
PROTOCOL="native",
+ SCHEMA="public",
USE_TLS="true"
);)";
auto result = session.ExecuteSchemeQuery(query).GetValueSync();
@@ -487,11 +488,12 @@ Y_UNIT_TEST_SUITE(KikimrIcGateway) {
UNIT_ASSERT_C(response.Success(), response.Issues().ToOneLineString());
UNIT_ASSERT_VALUES_EQUAL(response.Metadata->ExternalSource.Password, secretPasswordValue);
UNIT_ASSERT_VALUES_EQUAL(response.Metadata->ExternalSource.ServiceAccountIdSignature, secretSaValue);
- UNIT_ASSERT_VALUES_EQUAL(response.Metadata->ExternalSource.Properties.GetProperties().size(), 4);
+ UNIT_ASSERT_VALUES_EQUAL(response.Metadata->ExternalSource.Properties.GetProperties().size(), 5);
UNIT_ASSERT_VALUES_EQUAL(response.Metadata->ExternalSource.Properties.GetProperties().at("mdb_cluster_id"), "my_id");
UNIT_ASSERT_VALUES_EQUAL(response.Metadata->ExternalSource.Properties.GetProperties().at("database_name"), "my_db");
UNIT_ASSERT_VALUES_EQUAL(response.Metadata->ExternalSource.Properties.GetProperties().at("protocol"), "native");
UNIT_ASSERT_VALUES_EQUAL(response.Metadata->ExternalSource.Properties.GetProperties().at("use_tls"), "true");
+ UNIT_ASSERT_VALUES_EQUAL(response.Metadata->ExternalSource.Properties.GetProperties().at("schema"), "public");
}
}