Fixing paths in the script deployment scenarios

Author: Kirill Kravtsov

functions/Invoke-DBODeployment.ps1

@@ -145,15 +145,15 @@
                     Stop-PSFFunction -Message "Expected DBOpsFile object, got [$($scriptItem.GetType().FullName)]." -EnableException $true
                     return
                 }
-                Write-PSFMessage -Level Debug -Message "Adding deployment script $($scriptItem.FullName)"
+                Write-PSFMessage -Level Debug -Message "Adding deployment script $($scriptItem.FullName) as $($scriptItem.PackagePath)"
                 if (!$RegisterOnly) {
                     # Replace tokens in the scripts
                     $scriptContent = Resolve-VariableToken $scriptItem.GetContent() $runtimeVariables
                 }
                 else {
                     $scriptContent = ""
                 }
-                $scriptCollection += [DbUp.Engine.SqlScript]::new($scriptItem.FullName, $scriptContent)
+                $scriptCollection += [DbUp.Engine.SqlScript]::new($scriptItem.PackagePath, $scriptContent)
             }
         }
 

tests/postgresql/Install-DBOSqlScript.Tests.ps1

@@ -177,6 +177,35 @@ Describe "Install-DBOSqlScript PostgreSQL integration tests" -Tag $commandName,
             'd' | Should BeIn $testResults.name
         }
     }
+    Context "testing relative paths" {
+        BeforeAll {
+            $null = Invoke-DBOQuery @connParams -Database postgres -Query $dropDatabaseScript
+            [Npgsql.NpgsqlConnection]::ClearAllPools()
+            $null = Invoke-DBOQuery @connParams -Database postgres -Query $createDatabaseScript
+        }
+        It "should deploy version 1.0" {
+            $testResults = Install-DBOSqlScript -Relative -Type PostgreSQL -ScriptPath $v1scripts -SqlInstance $script:postgresqlInstance -Credential $script:postgresqlCredential -Database $newDbName -SchemaVersionTable $logTable -Silent
+            $testResults.Successful | Should Be $true
+            $testResults.Scripts.Name | Should Be ((Resolve-Path $v1scripts -Relative) -replace '^.[\\|\/]', '')
+            $testResults.SqlInstance | Should Be $script:postgresqlInstance
+            $testResults.Database | Should Be $newDbName
+            $testResults.SourcePath | Should Be $v1scripts
+            $testResults.ConnectionType | Should Be 'PostgreSQL'
+            $testResults.Configuration.SchemaVersionTable | Should Be $logTable
+            $testResults.Error | Should BeNullOrEmpty
+            $testResults.Duration.TotalMilliseconds | Should -BeGreaterOrEqual 0
+            $testResults.StartTime | Should Not BeNullOrEmpty
+            $testResults.EndTime | Should Not BeNullOrEmpty
+            $testResults.EndTime | Should -BeGreaterOrEqual $testResults.StartTime
+            'Upgrade successful' | Should BeIn $testResults.DeploymentLog
+
+            #Verifying objects
+            $testResults = Invoke-DBOQuery -Type PostgreSQL -SqlInstance $script:postgresqlInstance -Silent -Credential $script:postgresqlCredential -Database $newDbName -InputFile $verificationScript
+            $logTable | Should BeIn $testResults.name
+            'a' | Should BeIn $testResults.name
+            'b' | Should BeIn $testResults.name
+        }
+    }
     Context "testing deployment order" {
         BeforeAll {
             $null = Invoke-DBOQuery @connParams -Database postgres -Query $dropDatabaseScript
@@ -329,9 +358,9 @@ Describe "Install-DBOSqlScript PostgreSQL integration tests" -Tag $commandName,
         It "should deploy version 1.0" {
             $before = Invoke-DBOQuery -Type PostgreSQL -SqlInstance $script:postgresqlInstance -Silent -Credential $script:postgresqlCredential -Database $newDbName -InputFile $verificationScript
             $rowsBefore = ($before | Measure-Object).Count
-            $testResults = Install-DBOSqlScript -Absolute -Type PostgreSQL -ScriptPath $v1scripts -SqlInstance $script:postgresqlInstance -Credential $script:postgresqlCredential -Database $newDbName -Silent
+            $testResults = Install-DBOSqlScript -Type PostgreSQL -ScriptPath $v1scripts -SqlInstance $script:postgresqlInstance -Credential $script:postgresqlCredential -Database $newDbName -Silent
             $testResults.Successful | Should Be $true
-            $testResults.Scripts.Name | Should Be (Resolve-Path $v1scripts).Path
+            $testResults.Scripts.Name | Should Be (Get-Item $v1scripts).Name
             $testResults.SqlInstance | Should Be $script:postgresqlInstance
             $testResults.Database | Should Be $newDbName
             $testResults.SourcePath | Should Be $v1scripts
@@ -356,9 +385,9 @@ Describe "Install-DBOSqlScript PostgreSQL integration tests" -Tag $commandName,
         It "should deploy version 2.0" {
             $before = Invoke-DBOQuery -Type PostgreSQL -SqlInstance $script:postgresqlInstance -Silent -Credential $script:postgresqlCredential -Database $newDbName -InputFile $verificationScript
             $rowsBefore = ($before | Measure-Object).Count
-            $testResults = Install-DBOSqlScript -Absolute -Type PostgreSQL -ScriptPath $v2scripts -SqlInstance $script:postgresqlInstance -Credential $script:postgresqlCredential -Database $newDbName -Silent
+            $testResults = Install-DBOSqlScript -Type PostgreSQL -ScriptPath $v2scripts -SqlInstance $script:postgresqlInstance -Credential $script:postgresqlCredential -Database $newDbName -Silent
             $testResults.Successful | Should Be $true
-            $testResults.Scripts.Name | Should Be (Resolve-Path $v2scripts).Path
+            $testResults.Scripts.Name | Should Be (Get-Item $v2scripts).Name
             $testResults.SqlInstance | Should Be $script:postgresqlInstance
             $testResults.Database | Should Be $newDbName
             $testResults.SourcePath | Should Be $v2scripts