Fix after merge

ianton-ru · ianton-ru · commit 0e44a355633e · 2026-03-31T22:37:20.000+02:00
diff --git a/src/Databases/DataLake/DatabaseDataLake.cpp b/src/Databases/DataLake/DatabaseDataLake.cpp
@@ -267,6 +267,7 @@ std::shared_ptr<DataLake::ICatalog> DatabaseDataLake::getCatalog() const
                 google_adc_client_secret,
                 google_adc_refresh_token,
                 google_adc_quota_project_id,
+                settings[DatabaseDataLakeSetting::namespaces].value,
                 Context::getGlobalContextInstance());
             break;
         }
diff --git a/src/Databases/DataLake/RestCatalog.cpp b/src/Databases/DataLake/RestCatalog.cpp
@@ -333,8 +333,9 @@ OneLakeCatalog::OneLakeCatalog(
     const std::string & auth_scope_,
     const std::string & oauth_server_uri_,
     bool oauth_server_use_request_body_,
+    const std::string & namespaces_,
     DB::ContextPtr context_)
-    : RestCatalog(warehouse_, base_url_, auth_scope_, oauth_server_uri_, oauth_server_use_request_body_, context_)
+    : RestCatalog(warehouse_, base_url_, auth_scope_, oauth_server_uri_, oauth_server_use_request_body_, namespaces_, context_)
     , tenant_id(onelake_tenant_id)
 {
     client_id = onelake_client_id;
@@ -457,8 +458,9 @@ BigLakeCatalog::BigLakeCatalog(
     const std::string & google_adc_client_secret_,
     const std::string & google_adc_refresh_token_,
     const std::string & google_adc_quota_project_id_,
+    const std::string & namespaces_,
     DB::ContextPtr context_)
-    : RestCatalog(warehouse_, base_url_, "", "", false, context_)
+    : RestCatalog(warehouse_, base_url_, "", "", false, namespaces_, context_)
     , google_project_id(google_project_id_)
     , google_service_account(google_service_account_)
     , google_metadata_service(google_metadata_service_)
diff --git a/src/Databases/DataLake/RestCatalog.h b/src/Databases/DataLake/RestCatalog.h
@@ -143,7 +143,7 @@ class RestCatalog : public ICatalog, public DB::WithContext
         bool allow_tables = false;
     };
 
-private:
+protected:
     AllowedNamespaces allowed_namespaces;
 
     Poco::Net::HTTPBasicCredentials credentials{};
@@ -202,6 +202,7 @@ class OneLakeCatalog : public RestCatalog
         const std::string & auth_scope_,
         const std::string & oauth_server_uri_,
         bool oauth_server_use_request_body_,
+        const std::string & namespaces_,
         DB::ContextPtr context_);
 
     DB::DatabaseDataLakeCatalogType getCatalogType() const override
@@ -232,6 +233,7 @@ class BigLakeCatalog : public RestCatalog
         const std::string & google_adc_client_secret_,
         const std::string & google_adc_refresh_token_,
         const std::string & google_adc_quota_project_id_,
+        const std::string & namespaces_,
         DB::ContextPtr context_);
 
     DB::DatabaseDataLakeCatalogType getCatalogType() const override

Original file line number	Diff line number	Diff line change
`@@ -267,6 +267,7 @@ std::shared_ptr<DataLake::ICatalog> DatabaseDataLake::getCatalog() const`
`267`	`267`	`google_adc_client_secret,`
`268`	`268`	`google_adc_refresh_token,`
`269`	`269`	`google_adc_quota_project_id,`
	`270`	`+ settings[DatabaseDataLakeSetting::namespaces].value,`
`270`	`271`	`Context::getGlobalContextInstance());`
`271`	`272`	`break;`
`272`	`273`	`}`