Skip to content

Commit f771c35

Browse files
committed
✨ Simplify default return value
1 parent 4c32ce9 commit f771c35

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

Test-ConnectionString.ps1

+19-10
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ System.Management.Automation.PSObject containing properties about the connection
99
Database
1010
1111
.EXAMPLE
12-
Test-ConnectionString.ps1 'Server=(localdb)\ProjectsV13;Integrated Security=SSPI;Encrypt=True'
12+
Test-ConnectionString.ps1 'Server=(localdb)\ProjectsV13;Integrated Security=SSPI;Encrypt=True' -Details
1313
1414
ServerName : SERVERNAME\LOCALDB#DCCC9EEC
1515
AppName : Core Microsoft SqlClient Data Provider
@@ -48,17 +48,20 @@ LocalSMOVersion : 17.100.0.0
4848
#Requires -Version 3
4949
#Requires -Modules dbatools
5050
[CmdletBinding()][OutputType([psobject])] Param(
51-
[Parameter(Position=0,Mandatory=$true)][string] $ConnectionString
51+
[Parameter(Position=0,Mandatory=$true)][string] $ConnectionString,
52+
[switch] $Details
5253
)
5354
Process
5455
{
5556
try
5657
{
57-
$csb = New-DbaConnectionStringBuilder -ConnectionString $ConnectionString
58-
$server = Connect-DbaInstance -ConnectionString $ConnectionString
59-
$conn = Join-Keys.ps1 -ReferenceObject (New-Object Collections.Hashtable $csb) `
60-
-InputObject (Test-DbaConnection $csb.DataSource -SkipPSRemoting |ConvertTo-OrderedDictionary.ps1)
61-
$info = Invoke-DbaQuery -SqlInstance $server -As PSObject -Query @'
58+
if($Details)
59+
{
60+
$csb = New-DbaConnectionStringBuilder -ConnectionString $ConnectionString
61+
$server = Connect-DbaInstance -ConnectionString $ConnectionString
62+
$conn = Join-Keys.ps1 -ReferenceObject (New-Object Collections.Hashtable $csb) `
63+
-InputObject (Test-DbaConnection $csb.DataSource -SkipPSRemoting |ConvertTo-OrderedDictionary.ps1)
64+
$info = Invoke-DbaQuery -SqlInstance $server -As PSObject -Query @'
6265
select @@ServerName [ServerName], db_name() [DatabaseName],
6366
serverproperty('ComputerNamePhysicalNetBIOS') [ComputerName],
6467
serverproperty('MachineName') [MachineName],
@@ -67,9 +70,15 @@ select @@ServerName [ServerName], db_name() [DatabaseName],
6770
serverproperty('Edition') [Edition],
6871
app_name() [AppName];
6972
'@ |ConvertTo-OrderedDictionary.ps1
70-
if($info.ContainsKey('Password')) {$info['Password'] = ConvertTo-SecureString $info['Password'] -AsPlainText -Force}
71-
[void] $info.Add('Server', $server)
72-
return [pscustomobject](Join-Keys.ps1 $conn $info)
73+
if($info.ContainsKey('Password')) {$info['Password'] = ConvertTo-SecureString $info['Password'] -AsPlainText -Force}
74+
[void] $info.Add('Server', $server)
75+
return [pscustomobject](Join-Keys.ps1 $conn $info)
76+
}
77+
else
78+
{
79+
return Invoke-DbaQuery -SqlInstance (Connect-DbaInstance -ConnectionString $ConnectionString) `
80+
-Query 'select cast(1 as bit) Success;' |ConvertFrom-DataRow.ps1 -AsValues
81+
}
7382
}
7483
catch {return $false}
7584
}

0 commit comments

Comments
 (0)