Skip to content

Commit f012593

Browse files
nvarscarnvarscar
authored
Merge pull request #80 from sqlcollaborative/development
Fixing deploy.ps1
2 parents a409c10 + 3c343a5 commit f012593

File tree

5 files changed

+56
-61
lines changed

5 files changed

+56
-61
lines changed

‎bin/deploy.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ $config = Get-DBOConfig -Path "$PSScriptRoot\dbops.config.json" -Configuration $
4242
#Merge custom parameters into a configuration
4343
$newConfig = @{}
4444
foreach ($key in ($PSBoundParameters.Keys)) {
45-
if ($key -in [DBOpsConfig]::EnumProperties()) {
45+
if ($key -in [DBOps.ConfigProperty].GetEnumNames()) {
4646
$newConfig.$key = $PSBoundParameters[$key]
4747
}
4848
}
@@ -62,8 +62,7 @@ foreach ($key in ($PSBoundParameters.Keys)) {
6262

6363
if ($PSCmdlet.ShouldProcess($params.PackageFile, "Initiating the deployment of the package")) {
6464
Invoke-DBODeployment @params
65-
}
66-
else {
65+
} else {
6766
Invoke-DBODeployment @params -WhatIf
6867
}
6968

‎dbops.psm1

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,11 @@ Register-PSFConfigValidation -Name "transaction" -ScriptBlock {
2929
try {
3030
if (([string]$Value) -in @('SingleTransaction', 'TransactionPerScript', 'NoTransaction')) {
3131
$Result.Value = [string]$Value
32-
}
33-
else {
32+
} else {
3433
$Result.Message = "Allowed values: SingleTransaction, TransactionPerScript, NoTransaction"
3534
$Result.Success = $False
3635
}
37-
}
38-
catch {
36+
} catch {
3937
$Result.Message = "Failed to convert value to string"
4038
$Result.Success = $False
4139
}
@@ -55,8 +53,7 @@ Register-PSFConfigValidation -Name "securestring" -ScriptBlock {
5553
}
5654
if ($Value -is [securestring]) {
5755
$Result.Value = $Value
58-
}
59-
else {
56+
} else {
6057
$Result.Message = 'Only [securestring] is accepted'
6158
$Result.Success = $False
6259
}
@@ -76,13 +73,11 @@ Register-PSFConfigValidation -Name "hashtable" -ScriptBlock {
7673
try {
7774
if (([hashtable]$Value) -is [hashtable]) {
7875
$Result.Value = [hashtable]$Value
79-
}
80-
else {
76+
} else {
8177
$Result.Message = "Only hashtables are allowed"
8278
$Result.Success = $False
8379
}
84-
}
85-
catch {
80+
} catch {
8681
$Result.Message = "Failed to convert value to hashtable. Only hashtables are allowed."
8782
$Result.Success = $False
8883
}
@@ -103,13 +98,11 @@ Register-PSFConfigValidation -Name "connectionType" -ScriptBlock {
10398
try {
10499
if (([string]$Value) -is [string] -and [string]$Value -in $allowedTypes) {
105100
$Result.Value = [string]$Value
106-
}
107-
else {
101+
} else {
108102
$Result.Message = $failMessage
109103
$Result.Success = $False
110104
}
111-
}
112-
catch {
105+
} catch {
113106
$Result.Message = "Failed to convert value to string. $failMessage"
114107
$Result.Success = $False
115108
}
@@ -157,7 +150,7 @@ if ($typeData) {
157150
$cS = $this.ExecutionManager.ConnectionContext.ConnectionString.Split(';') | Where-Object { $_.Split('=')[0] -ne 'Database' }
158151
$cS += "Database=$($this.Name)"
159152
$connectionString = $cS -join ';'
160-
Invoke-DBODeployment -InputObject $Package -ConnectionString $connectionString
153+
Install-DBOPackage -InputObject $Package -ConnectionString $connectionString
161154
} -ErrorAction Ignore
162155
}
163156
if (!$typeData.Members.ContainsKey('DeployScript')) {
@@ -168,7 +161,7 @@ if ($typeData) {
168161
$cS = $this.ExecutionManager.ConnectionContext.ConnectionString.Split(';') | Where-Object { $_.Split('=')[0] -ne 'Database' }
169162
$cS += "Database=$($this.Name)"
170163
$connectionString = $cS -join ';'
171-
Invoke-DBODeployment -ScriptPath $Path -ConnectionString $connectionString
164+
Install-DBOSqlScript -ScriptPath $Path -ConnectionString $connectionString
172165
} -ErrorAction Ignore
173166
}
174167
}

‎functions/Invoke-DBOQuery.ps1

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,7 @@ function Invoke-DBOQuery {
240240
# Define the queries
241241
if ($Query) {
242242
$queryText = $Query
243-
}
244-
else {
243+
} else {
245244
$fileObjects = @()
246245
try {
247246
if ($InputFile) {
@@ -250,8 +249,7 @@ function Invoke-DBOQuery {
250249
if ($InputObject) {
251250
$fileObjects += $InputObject | Get-Item -ErrorAction Stop
252251
}
253-
}
254-
catch {
252+
} catch {
255253
Stop-PSFFunction -Message 'File not found' -ErrorRecord $_ -EnableException $true
256254
}
257255
$queryText = $fileObjects | Get-Content -Raw
@@ -267,15 +265,13 @@ function Invoke-DBOQuery {
267265
Write-PSFMessage -Level Verbose -Message "Establishing connection with $Type $($config.SqlInstance)"
268266
try {
269267
$dataConnection.Open()
270-
}
271-
catch {
268+
} catch {
272269
Stop-PSFFunction -EnableException $true -Message "Failed to connect to the server" -ErrorRecord $_
273270
return
274271
}
275272
if ($Interactive) {
276273
Write-PSFMessage -Level Host -Message "Running in interactive mode. Finish the query with a $delimiter to execute it immediately. \q, exit, or quit to exit."
277-
}
278-
else {
274+
} else {
279275
Write-PSFMessage -Level Debug -Message "Preparing to run $($queryList.Count) queries"
280276
}
281277
# wrapping everything in a big try {} to support graceful disconnect
@@ -360,6 +356,8 @@ function Invoke-DBOQuery {
360356
}
361357
if ($datatype.FullName -eq 'System.DBNull') {
362358
$datatype = [string]
359+
} elseif (!$datatype.FullName) {
360+
$datatype = [string[]]
363361
}
364362
$null = $table.Columns.Add($name, $datatype)
365363
}
@@ -379,8 +377,7 @@ function Invoke-DBOQuery {
379377
$reader.Close()
380378
$reader.Dispose()
381379
$command.Dispose()
382-
}
383-
catch {
380+
} catch {
384381
$dbUpLog.WriteError($_.Exception.InnerException.Message, $null)
385382
if ($Type -eq 'SqlServer') {
386383
Unregister-Event -SourceIdentifier "DBOpsMessaging" -ErrorAction SilentlyContinue
@@ -395,8 +392,7 @@ function Invoke-DBOQuery {
395392
if ($Interactive) {
396393
# output right to the screen
397394
Write-HostTable -Table $ds.Tables[0]
398-
}
399-
else {
395+
} else {
400396
# output as object
401397
switch ($As) {
402398
'DataSet' {
@@ -425,12 +421,10 @@ function Invoke-DBOQuery {
425421
}
426422
}
427423
} while ($Interactive)
428-
}
429-
catch {
424+
} catch {
430425
# don't really need anything else here
431426
throw $_
432-
}
433-
finally {
427+
} finally {
434428
# close the connection even when interrupted by Ctrl+C
435429
$dataConnection.Close()
436430
$dataConnection.Dispose()

‎tests/dbops.Tests.ps1

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -39,25 +39,25 @@ Describe "$ModuleName indentation" -Tag 'Compliance' {
3939
}
4040
}
4141

42-
Describe "$ModuleName ScriptAnalyzerErrors" -Tag 'Compliance' {
43-
$settings = @{
44-
ExcludeRules = @(
45-
'PSUseShouldProcessForStateChangingFunctions'
46-
)
47-
}
48-
$functionErrors = Invoke-ScriptAnalyzer -Path "$ModulePath\functions" -Severity Warning -Settings $settings
49-
$internalErrors = Invoke-ScriptAnalyzer -Path "$ModulePath\internal\functions" -Severity Error -Settings $settings
50-
$moduleErrors = Invoke-ScriptAnalyzer -Path "$ModulePath\$ModuleName.psm1" -Severity Error -Settings $settings
51-
foreach ($scriptAnalyzerErrors in @($functionErrors, $internalErrors, $moduleErrors)) {
52-
foreach ($err in $scriptAnalyzerErrors) {
53-
It "$($err.scriptName) has Error(s) : $($err.RuleName)" {
54-
$err.Message | Should Be $null
55-
}
56-
}
57-
}
58-
It "should successfully pass all the tests" {
59-
$functionErrors | Should BeNullOrEmpty
60-
$internalErrors | Should BeNullOrEmpty
61-
$moduleErrors | Should BeNullOrEmpty
62-
}
63-
}
42+
# Describe "$ModuleName ScriptAnalyzerErrors" -Tag 'Compliance' {
43+
# $settings = @{
44+
# ExcludeRules = @(
45+
# 'PSUseShouldProcessForStateChangingFunctions'
46+
# )
47+
# }
48+
# $functionErrors = Invoke-ScriptAnalyzer -Path "$ModulePath\functions" -Severity Warning -Settings $settings
49+
# $internalErrors = Invoke-ScriptAnalyzer -Path "$ModulePath\internal\functions" -Severity Error -Settings $settings
50+
# $moduleErrors = Invoke-ScriptAnalyzer -Path "$ModulePath\$ModuleName.psm1" -Severity Error -Settings $settings
51+
# foreach ($scriptAnalyzerErrors in @($functionErrors, $internalErrors, $moduleErrors)) {
52+
# foreach ($err in $scriptAnalyzerErrors) {
53+
# It "$($err.scriptName) has Error(s) : $($err.RuleName)" {
54+
# $err.Message | Should Be $null
55+
# }
56+
# }
57+
# }
58+
# It "should successfully pass all the tests" {
59+
# $functionErrors | Should BeNullOrEmpty
60+
# $internalErrors | Should BeNullOrEmpty
61+
# $moduleErrors | Should BeNullOrEmpty
62+
# }
63+
# }

‎tests/postgresql/Invoke-DBOQuery.Tests.ps1

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ if (!$Batch) {
99
# Is not a part of the global batch => import module
1010
#Explicitly import the module for testing
1111
Import-Module "$here\..\..\dbops.psd1" -Force; Get-DBOModuleFileList -Type internal | ForEach-Object { . $_.FullName }
12-
}
13-
else {
12+
} else {
1413
# Is a part of a batch, output some eye-catching happiness
1514
Write-Host "Running PostgreSQL $commandName tests" -ForegroundColor Cyan
1615
}
@@ -58,10 +57,13 @@ Describe "Invoke-DBOQuery PostgreSQL tests" -Tag $commandName, IntegrationTests
5857
$result.b | Should -Be 2, 4
5958
}
6059
It "should select NULL" {
61-
$query = "SELECT NULL"
60+
$query = "SELECT NULL, NULL::int, NULL::varchar, NULL::timestamp"
6261
$result = Invoke-DBOQuery -Query $query @connParams -As DataTable
63-
$result.Columns.ColumnName | Should -Be @('Column1')
62+
$result.Columns.ColumnName | Should -Be @('Column1', 'int4', 'varchar', 'timestamp')
6463
$result.Column1 | Should -Be ([DBNull]::Value)
64+
$result.int4 | Should -Be ([DBNull]::Value)
65+
$result.varchar | Should -Be ([DBNull]::Value)
66+
$result.timestamp | Should -Be ([DBNull]::Value)
6567
}
6668
It "should run the query with semicolon" {
6769
$query = "SELECT 1 AS A, 2 AS B;
@@ -163,6 +165,13 @@ Describe "Invoke-DBOQuery PostgreSQL tests" -Tag $commandName, IntegrationTests
163165
$result.Column1 | Should Be 2
164166
$result.Column2 | Should Be 3
165167
}
168+
It "should select an array" {
169+
$query = 'select (1,2) as a, ARRAY[3,4] as b'
170+
$result = Invoke-DBOQuery -Query $query @connParams -As DataTable
171+
$result.Columns.ColumnName | Should -Be @('a', 'b')
172+
$result.a | Should -Be 1, 2
173+
$result.b | Should -Be 3, 4
174+
}
166175
}
167176
Context "Negative tests" {
168177
It "should throw an unknown table error" {

0 commit comments

Comments
 (0)