From 1950af198ab8c5d8309bef1ae2f62b9e1c1ecc89 Mon Sep 17 00:00:00 2001 From: Jim Dale <26042891+jim-dale@users.noreply.github.com> Date: Thu, 30 Sep 2021 09:29:28 +0100 Subject: [PATCH 1/2] changed db size column to be decimal (not string) --- .../PowerShell Script/DMA_Processor_V5.0.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/features/data-migration-assistant/PowerShell Script/DMA_Processor_V5.0.ps1 b/samples/features/data-migration-assistant/PowerShell Script/DMA_Processor_V5.0.ps1 index fa152619..83538356 100644 --- a/samples/features/data-migration-assistant/PowerShell Script/DMA_Processor_V5.0.ps1 +++ b/samples/features/data-migration-assistant/PowerShell Script/DMA_Processor_V5.0.ps1 @@ -84,7 +84,7 @@ param( $col2 = New-Object Microsoft.SqlServer.Management.Smo.Column($ReportDatatbl, "InstanceName", [Microsoft.SqlServer.Management.Smo.DataType]::VarChar(50)) $col3 = New-Object Microsoft.SqlServer.Management.Smo.Column($ReportDatatbl, "Status", [Microsoft.SqlServer.Management.Smo.DataType]::VarChar(30)) $col4 = New-Object Microsoft.SqlServer.Management.Smo.Column($ReportDatatbl, "Name", [Microsoft.SqlServer.Management.Smo.DataType]::VarChar(255)) - $col5 = New-Object Microsoft.SqlServer.Management.Smo.Column($ReportDatatbl, "SizeMB", [Microsoft.SqlServer.Management.Smo.DataType]::VarChar(30)) + $col5 = New-Object Microsoft.SqlServer.Management.Smo.Column($ReportDatatbl, "SizeMB", [Microsoft.SqlServer.Management.Smo.DataType]::Decimal(6, 38)) $col6 = New-Object Microsoft.SqlServer.Management.Smo.Column($ReportDatatbl, "SourceCompatibilityLevel", [Microsoft.SqlServer.Management.Smo.DataType]::VarChar(15)) $col7 = New-Object Microsoft.SqlServer.Management.Smo.Column($ReportDatatbl, "TargetCompatibilityLevel", [Microsoft.SqlServer.Management.Smo.DataType]::VarChar(15)) $col8 = New-Object Microsoft.SqlServer.Management.Smo.Column($ReportDatatbl, "Category", [Microsoft.SqlServer.Management.Smo.DataType]::VarChar(30)) @@ -726,7 +726,7 @@ INSERT INTO BreakingChangeWeighting VALUES ('Microsoft.Rules.Data.Upgrade.UR0000 $datatable.columns.add("InstanceName",[String]) | Out-Null $datatable.columns.add("Status",[String]) | Out-Null $datatable.columns.add("Name",[String]) | Out-Null - $datatable.columns.add("SizeMB",[String]) | Out-Null + $datatable.columns.add("SizeMB",[Decimal]) | Out-Null $datatable.columns.add("SourceCompatibilityLevel",[String]) | Out-Null $datatable.columns.add("TargetCompatibilityLevel",[String]) | Out-Null $datatable.columns.add("Category",[String]) | Out-Null From cfc09082ec43b745af01718916c980693dbd93f1 Mon Sep 17 00:00:00 2001 From: Jim Dale <26042891+jim-dale@users.noreply.github.com> Date: Thu, 30 Sep 2021 10:52:05 +0100 Subject: [PATCH 2/2] dont set property value if property doesn't exist (assessment.ImpactedDatabases) --- .../PowerShell Script/DMA_Processor_V5.0.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/features/data-migration-assistant/PowerShell Script/DMA_Processor_V5.0.ps1 b/samples/features/data-migration-assistant/PowerShell Script/DMA_Processor_V5.0.ps1 index 83538356..05b62d21 100644 --- a/samples/features/data-migration-assistant/PowerShell Script/DMA_Processor_V5.0.ps1 +++ b/samples/features/data-migration-assistant/PowerShell Script/DMA_Processor_V5.0.ps1 @@ -826,9 +826,9 @@ INSERT INTO BreakingChangeWeighting VALUES ('Microsoft.Rules.Data.Upgrade.UR0000 { foreach($assessment in $serverInstances.AssessmentRecommendations) #level 3, the assessment { - $assessment.ImpactedDatabases = if ($assessment.ImpactedDatabases.Length -eq 0) {$blankImpactedDatabases} else {$assessment.ImpactedDatabases} + $impactedDatabases = if (($assessment.ImpactedDatabases -eq $null) -or ($assessment.ImpactedDatabases.Length -eq 0)) {$blankImpactedDatabases} else {$assessment.ImpactedDatabases} - foreach($impacteddbs in $assessment.ImpactedDatabases) #level 4, the impacted objects + foreach($impacteddbs in $impactedDatabases) #level 4, the impacted objects { #TODO Get date here will eventually be replace with timestamp from JSON file $azuredatatable.rows.add((Get-Date).toString(), $serverInstances.ServerName, $serverInstances.Version, $serverInstances.Status, $assessment.Category, $assessment.Severity, $assessment.FeatureParityCategory, $assessment.RuleId, $assessment.Title, $assessment.Impact, $assessment.Recommendation, $assessment.MoreInfo, $impacteddbs.Name, $impacteddbs.ObjectType, $impacteddbs.ImpactDetail) | Out-Null