Commit 7a9bbef

authored

Merge pull request dataplat#3881 from andrekamman/development

Fixed support for SQL Server 2016 SP2 & Azure SQL Database in DiagnosticQueries

2 parents 42fe971 + 8af087e commit 7a9bbefCopy full SHA for 7a9bbef

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ function Get-DbaDatabase {`
`289`	`289`	`$_.IsAccessible -in $AccessibleFilter -and`
`290`	`290`	`$_.IsSystemObject -in $DBType -and`
`291`	`291`	`((Compare-Object @($_.Status.tostring().split(',').trim()) $Status -ExcludeDifferent -IncludeEqual).inputobject.count -ge 1 -or !$status) -and`
`292`		`- $_.RecoveryModel -in $RecoveryModel -and`
	`292`	`+ ($_.RecoveryModel -in $RecoveryModel-or!$_.RecoveryModel) -and`
`293`	`293`	`$_.EncryptionEnabled -in $Encrypt`
`294`	`294`	`}`
`295`	`295`	`if ($NoFullBackup -or $NoFullBackupSince) {`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,14 @@ function Invoke-DbaDiagnosticQuery {`
`250`	`250`	`}`
`251`	`251`	`}`
`252`	`252`
	`253`	`+ if ($version -eq "2016" -and $server.VersionMinor -gt 5026 ) {`
	`254`	`+ $version = "2016SP2"`
	`255`	`+ }`
	`256`	`+`
	`257`	`+ if ($server.DatabaseEngineType -eq "SqlAzureDatabase") {`
	`258`	`+ $version = "AzureSQLDatabase"`
	`259`	`+ }`
	`260`	`+`
`253`	`261`	`if (!$instanceOnly) {`
`254`	`262`	`if (-not $Database) {`
`255`	`263`	`$databases = (Get-DbaDatabase -SqlInstance $server -ExcludeAllSystemDb -ExcludeDatabase $ExcludeDatabase).Name`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`
`28`	`28`	`foreach ($line in $fullscript) {`
`29`	`29`	`if ($start -eq $false) {`
`30`		`- if ($line -match "You have the correct major version of SQL Server for this diagnostic information script") {`
	`30`	`+ if (($line -match "You have the correct major version of SQL Server for this diagnostic information script") -or ($line.StartsWith("-- Server level queries ***"))) {`
`31`	`31`	`$start = $true`
`32`	`32`	`}`
`33`	`33`	`continue`

Comments

(0)