Skip to content

Commit aea501f

Browse files
committed
Changed call to Test-PdcConfiguration
Fixed bug in query for clone Changed check for test in Remove-PdcDatabaseImage Removed text from referring to previous module
1 parent 039ef46 commit aea501f

6 files changed

Lines changed: 10 additions & 14 deletions

File tree

functions/Invoke-PdcRepairClone.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function Invoke-PdcRepairClone {
4949

5050
begin {
5151
# Test the module database setup
52-
$result = Test-PdcConfiguration -SqlInstance $ecDatabaseServer -SqlCredential $SqlCredential -Database $ecDatabaseName
52+
$result = Test-PdcConfiguration
5353

5454
if(-not $result.Check){
5555
Stop-PSFFunction -Message $result.Message -Target $result -Continue

functions/New-PdcDatabaseClone.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ function New-PdcDatabaseClone {
9595
Write-PSFMessage -Message "Started image creation" -Level Output
9696

9797
# Test the module database setup
98-
$result = Test-PdcConfiguration -SqlInstance $ecDatabaseServer -SqlCredential $SqlCredential -Database $ecDatabaseName
98+
$result = Test-PdcConfiguration
9999

100100
if(-not $result.Check){
101101
Stop-PSFFunction -Message $result.Message -Target $result -Continue
@@ -157,7 +157,7 @@ function New-PdcDatabaseClone {
157157
[DatabaseName],
158158
[DatabaseTimestamp],
159159
[CreatedOn]
160-
FROM [EasyClone].[dbo].[Image]
160+
FROM [dbo].[Image]
161161
WHERE DatabaseName = '$db'
162162
ORDER BY CreatedOn DESC;
163163
"

functions/New-PdcDatabaseImage.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ function New-PdcDatabaseImage {
119119
begin {
120120

121121
# Test the module database setup
122-
$result = Test-PdcConfiguration -SqlInstance $ecDatabaseServer -SqlCredential $SqlCredential -Database $ecDatabaseName
122+
$result = Test-PdcConfiguration
123123

124124
if(-not $result.Check){
125125
Stop-PSFFunction -Message $result.Message -Target $result -Continue

functions/Remove-PdcDatabaseClone.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ function Remove-PdcDatabaseClone {
8585
Write-PSFMessage -Message "Started removing database clones" -Level Verbose
8686

8787
# Test the module database setup
88-
$result = Test-PdcConfiguration -SqlInstance $ecDatabaseServer -SqlCredential $SqlCredential -Database $ecDatabaseName
88+
$result = Test-PdcConfiguration
8989

9090
if(-not $result.Check){
9191
Stop-PSFFunction -Message $result.Message -Target $result -Continue
@@ -147,12 +147,12 @@ function Remove-PdcDatabaseClone {
147147
foreach ($result in $results) {
148148

149149
# Connect to the instance
150-
Write-PSFMessage -Message "Attempting to connect to easy clone database server $($result.SqlInstance).." -Level Verbose
150+
Write-PSFMessage -Message "Attempting to connect to clone database server $($result.SqlInstance).." -Level Verbose
151151
try {
152152
$server = Connect-DbaInstance -SqlInstance $result.SqlInstance -SqlCredential $SqlCredential
153153
}
154154
catch {
155-
Stop-PSFFunction -Message "Could not connect to Sql Server instance $server" -ErrorRecord $_ -Target $server -Continue
155+
Stop-PSFFunction -Message "Could not connect to clone Sql Server instance $server" -ErrorRecord $_ -Target $server -Continue
156156
}
157157

158158
# Remove the database

functions/Remove-PdcDatabaseImage.ps1

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,8 @@ function Remove-PdcDatabaseImage {
4545
begin {
4646
Write-PSFMessage -Message "Started removing database images" -Level Verbose
4747

48-
# Get the configurations for the program database
49-
$ecDatabaseName = Get-PSFConfigValue -FullName easyclone.database.name
50-
$ecDatabaseServer = Get-PSFConfigValue -FullName easyclone.database.server
51-
5248
# Test the module database setup
53-
$result = Test-PdcConfiguration -SqlInstance $ecDatabaseServer -SqlCredential $SqlCredential -Database $ecDatabaseName
49+
$result = Test-PdcConfiguration
5450

5551
if(-not $result.Check){
5652
Stop-PSFFunction -Message $result.Message -Target $result -Continue

internal/functions/Test-PdcConfiguration.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function Test-PdcConfiguration {
5555

5656
$errorOccured = $false
5757

58-
# Check if the values for the EasyClone database are set
58+
# Check if the values for the PSDatabaseClone database are set
5959
if (($SqlInstance -eq $null) -or ($Database -eq $null)) {
6060
# Get the configurations for the program database
6161
$Database = Get-PSFConfigValue -FullName psdatabaseclone.database.name -Fallback "NotConfigured"
@@ -95,7 +95,7 @@ function Test-PdcConfiguration {
9595
}
9696
}
9797

98-
# Check if the easyclone database is present
98+
# Check if the PSDatabaseClone database is present
9999
if ($ecServer.Databases.Name -notcontains $Database) {
100100
$errorOccured = $true
101101
$result.Check = $false

0 commit comments

Comments
 (0)