From 4d2e3b85c8009cf27cce7b8dd4068b36eab6a4f4 Mon Sep 17 00:00:00 2001 From: Oleksandr Nikolaiev Date: Tue, 11 Jul 2023 14:20:51 +0300 Subject: [PATCH 1/2] Fix. Incorrect syntax if dbname include hypern --- d365fo.tools/functions/import-d365bacpac.ps1 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/d365fo.tools/functions/import-d365bacpac.ps1 b/d365fo.tools/functions/import-d365bacpac.ps1 index aca14db2..53ffa639 100644 --- a/d365fo.tools/functions/import-d365bacpac.ps1 +++ b/d365fo.tools/functions/import-d365bacpac.ps1 @@ -252,6 +252,11 @@ function Import-D365Bacpac { return } + if($DatabaseName.Contains("-")) + { + $DatabaseName = $DatabaseName.Replace("-","_") + } + if ($PSBoundParameters.ContainsKey("CustomSqlFile")) { if (-not (Test-PathExists -Path $CustomSqlFile -Type Leaf)) { return From f0e0d4fcdb7c15eb28df9679b6327741087a4a26 Mon Sep 17 00:00:00 2001 From: Oleksandr Nikolaiev Date: Tue, 11 Jul 2023 16:33:17 +0300 Subject: [PATCH 2/2] Cleanup. Fix SQL file. --- d365fo.tools/functions/import-d365bacpac.ps1 | 5 ----- d365fo.tools/internal/sql/set-bacpacvaluessql.sql | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/d365fo.tools/functions/import-d365bacpac.ps1 b/d365fo.tools/functions/import-d365bacpac.ps1 index 53ffa639..aca14db2 100644 --- a/d365fo.tools/functions/import-d365bacpac.ps1 +++ b/d365fo.tools/functions/import-d365bacpac.ps1 @@ -252,11 +252,6 @@ function Import-D365Bacpac { return } - if($DatabaseName.Contains("-")) - { - $DatabaseName = $DatabaseName.Replace("-","_") - } - if ($PSBoundParameters.ContainsKey("CustomSqlFile")) { if (-not (Test-PathExists -Path $CustomSqlFile -Type Leaf)) { return diff --git a/d365fo.tools/internal/sql/set-bacpacvaluessql.sql b/d365fo.tools/internal/sql/set-bacpacvaluessql.sql index 6d19c9b1..2a809228 100644 --- a/d365fo.tools/internal/sql/set-bacpacvaluessql.sql +++ b/d365fo.tools/internal/sql/set-bacpacvaluessql.sql @@ -18,7 +18,7 @@ END IF EXISTS (SELECT * FROM sys.syslogins WHERE NAME = 'axdbadmin') BEGIN - ALTER AUTHORIZATION ON database::@DATABASENAME TO sa + ALTER AUTHORIZATION ON database::[@DATABASENAME] TO sa CREATE USER axdbadmin FROM LOGIN axdbadmin EXEC sp_addrolemember 'db_owner', 'axdbadmin'