Merge pull request #76 from sqlcollaborative/development

Fixing variable replacement

Author: nvarscar

functions/Invoke-DBODeployment.ps1

@@ -134,7 +134,7 @@
                     $scriptDeploymentPath = $script.GetDeploymentPath()
                     Write-PSFMessage -Level Debug -Message "Adding deployment script $scriptDeploymentPath"
                     # Replace tokens in the scripts
-                    $scriptContent = Resolve-VariableToken $script.GetContent() $runtimeVariables
+                    $scriptContent = Resolve-VariableToken $script.GetContent() $config.Variables
                     $scriptCollection += [DbUp.Engine.SqlScript]::new($scriptDeploymentPath, $scriptContent)
                 }
             }
@@ -148,7 +148,7 @@
                 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
+                    $scriptContent = Resolve-VariableToken $scriptItem.GetContent() $config.Variables
                 }
                 else {
                     $scriptContent = ""

tests/Install-DBOSqlScript.Tests.ps1

@@ -264,6 +264,22 @@ Describe "Install-DBOSqlScript integration tests" -Tag $commandName, Integration
             $output | Should BeLike '*Successful!*'
         }
     }
+    Context "testing variable replacement" {
+        BeforeAll {
+            $file = "$workFolder\delay.sql"
+            "SELECT '#{var1}'; PRINT ('#{var2}')" | Out-File $file
+        }
+        It "should return replaced variables" {
+            $vars = @{
+                var1 = 1337
+                var2 = 'Replaced!'
+            }
+            $testResults = Install-DBOSqlScript -ScriptPath "$workFolder\delay.sql" -SqlInstance $script:mssqlInstance -Credential $script:mssqlCredential -Database $newDbName -SchemaVersionTable $null -OutputFile "$workFolder\log.txt" -Silent -Variables $vars
+            $testResults.Successful | Should Be $true
+            "$workFolder\log.txt" | Should -FileContentMatch '1337'
+            "$workFolder\log.txt" | Should -FileContentMatch 'Replaced!'
+        }
+    }
     Context  "$commandName whatif tests" {
         BeforeAll {
             $null = Invoke-DBOQuery -SqlInstance $script:mssqlInstance -Silent -Credential $script:mssqlCredential -Database $newDbName -InputFile $cleanupScript