Adding column name verifications

Author: nvarscar

tests/postgresql/Invoke-DBOQuery.Tests.ps1

@@ -51,18 +51,22 @@ Describe "Invoke-DBOQuery PostgreSQL tests" -Tag $commandName, IntegrationTests
         It "should run the query" {
             $query = "SELECT 1 AS A, 2 AS B UNION ALL SELECT NULL AS A, 4 AS B"
             $result = Invoke-DBOQuery -Query $query @connParams -As DataTable
+            $result.Columns.ColumnName | Should -Be @('A', 'B')
             $result.A | Should -Be 1, ([DBNull]::Value)
             $result.B | Should -Be 2, 4
         }
         It "should select NULL" {
             $query = "SELECT NULL"
             $result = Invoke-DBOQuery -Query $query @connParams -As DataTable
+            $result.Columns.ColumnName | Should -Be @('Column1')
             $result.Column1 | Should -Be ([DBNull]::Value)
         }
         It "should run the query with semicolon" {
             $query = "SELECT 1 AS A, 2 AS B;
             SELECT 3 AS A, 4 AS B"
             $result = Invoke-DBOQuery -Query $query @connParams -As DataTable
+            $result[0].Columns.ColumnName | Should -Be @('A', 'B')
+            $result[1].Columns.ColumnName | Should -Be @('A', 'B')
             $result[0].A | Should -Be 1
             $result[0].B | Should -Be 2
             $result[1].A | Should -Be 3
@@ -72,6 +76,8 @@ Describe "Invoke-DBOQuery PostgreSQL tests" -Tag $commandName, IntegrationTests
             $query = "SELECT 1 AS A, 2 AS B;
             SELECT 3 AS A, 4 AS B"
             $result = Invoke-DBOQuery -Query $query @connParams -As Dataset
+            $result.Tables[0].Columns.ColumnName | Should Be @('A', 'B')
+            $result.Tables[1].Columns.ColumnName | Should Be @('A', 'B')
             $result.Tables[0].A | Should -Be 1
             $result.Tables[0].B | Should -Be 2
             $result.Tables[1].A | Should -Be 3
@@ -80,6 +86,7 @@ Describe "Invoke-DBOQuery PostgreSQL tests" -Tag $commandName, IntegrationTests
         It "should run the query as a PSObject" {
             $query = "SELECT 1 AS A, 2 AS B UNION ALL SELECT NULL AS A, 4 AS B"
             $result = Invoke-DBOQuery -Query $query @connParams -As PSObject
+            $result[0].psobject.properties.Name | Should -Be @('A', 'B')
             $result.A | Should -Be 1, $null
             $result.B | Should -Be 2, 4
         }
@@ -94,6 +101,8 @@ Describe "Invoke-DBOQuery PostgreSQL tests" -Tag $commandName, IntegrationTests
             "SELECT 1 AS A, 2 AS B" | Out-File $file1 -Force
             "SELECT 3 AS A, 4 AS B" | Out-File $file2 -Force -Encoding bigendianunicode
             $result = Invoke-DBOQuery -InputFile $file1, $file2 @connParams -As DataTable
+            $result[0].Columns.ColumnName | Should -Be @('A', 'B')
+            $result[1].Columns.ColumnName | Should -Be @('A', 'B')
             $result[0].A | Should -Be 1
             $result[0].B | Should -Be 2
             $result[1].A | Should -Be 3
@@ -105,11 +114,15 @@ Describe "Invoke-DBOQuery PostgreSQL tests" -Tag $commandName, IntegrationTests
             "SELECT 1 AS A, 2 AS B" | Out-File $file1 -Force
             "SELECT 3 AS A, 4 AS B" | Out-File $file2 -Force -Encoding bigendianunicode
             $result = Get-Item $file1, $file2 | Invoke-DBOQuery @connParams -As DataTable
+            $result[0].Columns.ColumnName | Should -Be @('A', 'B')
+            $result[1].Columns.ColumnName | Should -Be @('A', 'B')
             $result[0].A | Should -Be 1
             $result[0].B | Should -Be 2
             $result[1].A | Should -Be 3
             $result[1].B | Should -Be 4
             $result = $file1, $file2 | Invoke-DBOQuery @connParams -As DataTable
+            $result[0].Columns.ColumnName | Should -Be @('A', 'B')
+            $result[1].Columns.ColumnName | Should -Be @('A', 'B')
             $result[0].A | Should -Be 1
             $result[0].B | Should -Be 2
             $result[1].A | Should -Be 3
@@ -118,12 +131,14 @@ Describe "Invoke-DBOQuery PostgreSQL tests" -Tag $commandName, IntegrationTests
         It "should run the query with custom variables" {
             $query = "SELECT '#{Test}' AS A, '#{Test2}' AS B UNION ALL SELECT '3' AS A, '4' AS B"
             $result = Invoke-DBOQuery -Query $query @connParams -As DataTable -Variables @{ Test = '1'; Test2 = '2'}
+            $result.Columns.ColumnName | Should -Be @('A', 'B')
             $result.A | Should -Be '1', '3'
             $result.B | Should -Be '2', '4'
         }
         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 -Type PostgreSQL -Database postgres -Query $query -SqlInstance '#{srv}' -Credential $script:postgresqlCredential -As DataTable -Variables @{ Srv = $script:postgresqlInstance }
+            $result = Invoke-DBOQuery -Type PostgreSQL -Database postgres -Query $query -SqlInstance '#{srv}' -Credential $script:postgresqlCredential -As DataTable -Variables @{ srv = $script:postgresqlInstance }
+            $result.Columns.ColumnName | Should -Be @('A', 'B')
             $result.A | Should -Be '1', '3'
             $result.B | Should -Be '2', '4'
         }
@@ -154,7 +169,9 @@ Describe "Invoke-DBOQuery PostgreSQL tests" -Tag $commandName, IntegrationTests
         }
         It "should throw a connection timeout error" {
             $query = "SELECT 1/0"
-            { $null = Invoke-DBOQuery -Type PostgreSQL -Query $query -SqlInstance localhost:6493 -Credential $script:postgresqlCredential -ConnectionTimeout 1} | Should throw "The operation has timed out"
+            try { $null = Invoke-DBOQuery -Type PostgreSQL -Query $query -SqlInstance localhost:6493 -Credential $script:postgresqlCredential -ConnectionTimeout 1}
+            catch { $errVar = $_ }
+            $errVar.Exception.Message | Should -Match "The operation has timed out|Connection refused"
         }
         It "should fail when credentials are wrong" {
             try { Invoke-DBOQuery -Type PostgreSQL -Query 'SELECT 1' -SqlInstance $script:postgresqlInstance -Credential ([pscredential]::new('nontexistent', ([securestring]::new()))) }