diff --git a/ydb/core/kqp/host/kqp_gateway_proxy.cpp b/ydb/core/kqp/host/kqp_gateway_proxy.cpp index 2c02d7a7fe6e..caae4290edab 100644 --- a/ydb/core/kqp/host/kqp_gateway_proxy.cpp +++ b/ydb/core/kqp/host/kqp_gateway_proxy.cpp @@ -1209,7 +1209,7 @@ class TKqpGatewayProxy : public IKikimrGateway { } NKikimrSchemeOp::TModifyScheme tx; - tx.SetWorkingDir(GetDatabase()); + tx.SetWorkingDir(GetDatabase() ? GetDatabase() : GetDomainName().GetOrElse(TString{})); tx.SetOperationType(NKikimrSchemeOp::ESchemeOpCreateBackupCollection); auto& op = *tx.MutableCreateBackupCollection(); @@ -1279,7 +1279,7 @@ class TKqpGatewayProxy : public IKikimrGateway { } NKikimrSchemeOp::TModifyScheme tx; - tx.SetWorkingDir(GetDatabase()); + tx.SetWorkingDir(GetDatabase() ? GetDatabase() : GetDomainName().GetOrElse(TString{})); tx.SetOperationType(NKikimrSchemeOp::ESchemeOpAlterBackupCollection); auto& op = *tx.MutableAlterBackupCollection(); @@ -1326,7 +1326,7 @@ class TKqpGatewayProxy : public IKikimrGateway { } NKikimrSchemeOp::TModifyScheme tx; - tx.SetWorkingDir(GetDatabase()); + tx.SetWorkingDir(GetDatabase() ? GetDatabase() : GetDomainName().GetOrElse(TString{})); if (settings.Cascade) { return MakeFuture(ResultFromError("Unimplemented")); } else { @@ -1374,7 +1374,7 @@ class TKqpGatewayProxy : public IKikimrGateway { } NKikimrSchemeOp::TModifyScheme tx; - tx.SetWorkingDir(GetDatabase()); + tx.SetWorkingDir(GetDatabase() ? GetDatabase() : GetDomainName().GetOrElse(TString{})); tx.SetOperationType(NKikimrSchemeOp::ESchemeOpBackupBackupCollection); auto& op = *tx.MutableBackupBackupCollection(); @@ -1417,7 +1417,7 @@ class TKqpGatewayProxy : public IKikimrGateway { } NKikimrSchemeOp::TModifyScheme tx; - tx.SetWorkingDir(GetDatabase()); + tx.SetWorkingDir(GetDatabase() ? GetDatabase() : GetDomainName().GetOrElse(TString{})); tx.SetOperationType(NKikimrSchemeOp::ESchemeOpBackupIncrementalBackupCollection); auto& op = *tx.MutableBackupIncrementalBackupCollection();