Fix .Query() and .Invoke() on server for special connections and enhance exception text (#9410)

Author: andreasjordan

bin/type-extensions.ps1

@@ -1069,9 +1069,6 @@ if ($option.LoadTypes -or
     Write-ImportTime -Text "Updating type data"
 }
 
-Import-Command -Path "$script:PSModuleRoot/bin/type-extensions.ps1"
-Write-ImportTime -Text "Loading type extensions"
-
 $loadedModuleNames = (Get-Module sqlserver, sqlps -ErrorAction Ignore).Name
 if ($loadedModuleNames -contains 'sqlserver' -or $loadedModuleNames -contains 'sqlps') {
     if (Get-DbatoolsConfigValue -FullName Import.SqlpsCheck) {

dbatools.psm1

@@ -36,54 +36,58 @@ $this.ExecuteNonQuery($Command)
 <Name>Query</Name>
 <Script>
 param (
-    $Query,
-    $Database,
-    $AllTables = $false
+    [string]$Query,
+    [string]$Database,
+    [bool]$AllTables
 )
 
-if (-not $Database) {
-    if ($this.ConnectionContext.DatabaseEngineType -eq "SqlAzureDatabase") {
-        $Database = $this.ConnectionContext.ExecuteScalar("select db_name()")
-        if (-not $Database) {
-            $Database = $this.ConnectionContext.SqlConnectionObject.Database
-        }
-
-        if (-not $Database) {
-            $Database = $this.ConnectionContext.DatabaseName
-        }
+try {
+    if ($Database) {
+        $dataSet = $this.Databases[$Database].ExecuteWithResults($Query)
+    } else {
+        $dataSet = $this.ConnectionContext.ExecuteWithResults($Query)
     }
-    if (-not $Database) {
-        $Database = "master"
+    if ($AllTables) {
+        $dataSet.Tables
+    } else {
+        $dataSet.Tables[0]
     }
+} catch {
+    $message = ''
+    $innerException = $_.Exception.InnerException
+    while ($innerException.InnerException) {
+        $message += $innerException.Message
+        $innerException = $innerException.InnerException
+    }
+    $message += $innerException.Message
+    throw $message
 }
-if ($AllTables) { ($this.Databases[$Database].ExecuteWithResults($Query)).Tables }
-else { ($this.Databases[$Database].ExecuteWithResults($Query)).Tables[0] }
 </Script>
 </ScriptMethod>
 <ScriptMethod>
 <Name>Invoke</Name>
 <Script>
 param (
-    $Command,
-    $Database
+    [string]$Command,
+    [string]$Database
 )
 
-if (-not $Database) {
-    if ($this.ConnectionContext.DatabaseEngineType -eq "SqlAzureDatabase") {
-        $Database = $this.ConnectionContext.ExecuteScalar("select db_name()")
-        if (-not $Database) {
-            $Database = $this.ConnectionContext.SqlConnectionObject.Database
-        }
-
-        if (-not $Database) {
-            $Database = $this.ConnectionContext.DatabaseName
-        }
+try {
+    if ($Database) {
+        $this.Databases[$Database].ExecuteNonQuery($Command)
+    } else {
+        $this.ConnectionContext.ExecuteNonQuery($Command)
     }
-    if (-not $Database) {
-        $Database = "master"
+} catch {
+    $message = ''
+    $innerException = $_.Exception.InnerException
+    while ($innerException.InnerException) {
+        $message += $innerException.Message
+        $innerException = $innerException.InnerException
     }
+    $message += $innerException.Message
+    throw $message
 }
-$this.Databases[$Database].ExecuteNonQuery($Command)
 </Script>
 </ScriptMethod>
 </Members>