Merge pull request #113 from sqlcollaborative/development

0.6.3

Author: nvarscar

docs/changelog.md

@@ -1,3 +1,5 @@
+# Release notes for v0.6.3:
+- ### Adding hyphen to the variable token symbols (#112) by @nvarscar
 # Release notes for v0.6.2:
 - ### Ensuring deploy.ps1 only uses public functions (#108) by @nvarscar
 # Release notes for v0.6.1:

internal/functions/Resolve-VariableToken.ps1

@@ -24,7 +24,7 @@
     foreach ($obj in $InputObject) {
         if ($obj -is [string]) {
             $output = $obj
-            foreach ($token in (Get-VariableToken -InputString $obj -RegexString $TokenRegex.Replace('token', '[a-zA-Z0-9\.]+'))) {
+            foreach ($token in (Get-VariableToken -InputString $obj -RegexString $TokenRegex.Replace('token', '[a-zA-Z0-9\-.]+'))) {
                 #Replace variables found in the config
                 $tokenRegExString = $TokenRegex.Replace('token', [Regex]::Escape($token))
                 if ($Runtime) {

tests/Invoke-DBOQuery.Tests.ps1

@@ -147,10 +147,14 @@ Describe "Invoke-DBOQuery tests" -Tag $commandName, IntegrationTests {
             (Get-PSFConfig -FullName dbops.config.variabletoken).ResetValue()
         }
         It "should connect to the server from a custom variable" {
-            $query = "SELECT 1 AS A, 2 AS B UNION ALL SELECT 3 AS A, 4 AS B"
-            $result = Invoke-DBOQuery -Query $query -SqlInstance '#{srv}' -Credential $script:mssqlCredential -As DataTable -Variables @{ Srv = $script:mssqlInstance }
-            $result.A | Should -Be '1', '3'
-            $result.B | Should -Be '2', '4'
+            $query = "SELECT 1 AS A, 2 AS B UNION ALL SELECT '#{tst}' AS A, #{a.b-c} AS B"
+            $result = Invoke-DBOQuery -Query $query -SqlInstance '#{srv}' -Credential $script:mssqlCredential -As DataTable -Variables @{
+                Srv     = $script:mssqlInstance
+                tst     = 3
+                "a.b-c" = 4
+            }
+            $result.A | Should -Be 1, '3'
+            $result.B | Should -Be 2, 4
         }
         It "should run the query with custom parameters" {
             $query = "SELECT @p1 AS A, @p2 AS B"