From 38226df51d99beae6208db024e380bc4d769be73 Mon Sep 17 00:00:00 2001 From: JosephPilov-msft <23519517+PiJoCoder@users.noreply.github.com> Date: Tue, 23 Apr 2024 12:42:22 -0500 Subject: [PATCH] #336 update to table and report columns --- NexusReports/Missing_MSIs_or_MSPs_C.rdl | 162 +++++++++++++++---- RowsetImportEngine/TextRowsets.xml | 7 +- sqlnexus/PerfStatsAnalysis.sql | 10 +- sqlnexus/Reports/Missing_MSIs_or_MSPs_C.rdlC | 162 +++++++++++++++---- sqlnexus/TextRowsets.xml | 7 +- 5 files changed, 269 insertions(+), 79 deletions(-) diff --git a/NexusReports/Missing_MSIs_or_MSPs_C.rdl b/NexusReports/Missing_MSIs_or_MSPs_C.rdl index 167cfde..63bb4bf 100644 --- a/NexusReports/Missing_MSIs_or_MSPs_C.rdl +++ b/NexusReports/Missing_MSIs_or_MSPs_C.rdl @@ -19,9 +19,10 @@ DataSource_Private SELECT ProductName, - Version, - PackageName, - ExpectedInstallerCacheFile + ExpectedInstallerCacheFile, + FileIsPresentInCacheButLikelyCorrupt, + ProductVersion, + PackageName FROM dbo.tbl_setup_missing_msi_msp_packages true @@ -30,8 +31,8 @@ FROM dbo.tbl_setup_missing_msi_msp_packages ProductName System.String - - Version + + FileIsPresentInCacheButLikelyCorrupt System.String @@ -42,6 +43,10 @@ FROM dbo.tbl_setup_missing_msi_msp_packages ExpectedInstallerCacheFile System.String + + ProductVersion + System.String + @@ -87,13 +92,16 @@ FROM dbo.tbl_setup_missing_msi_msp_packages 3.13542in - 1.23958in + 3.33333in - 2.79167in + 3.27083in + + + 1.23958in - 3.90625in + 2.79167in @@ -144,14 +152,14 @@ FROM dbo.tbl_setup_missing_msi_msp_packages - + true true - Version + Expected Installer Cache File @@ -175,7 +183,6 @@ FROM dbo.tbl_setup_missing_msi_msp_packages MediumSlateBlue - 2pt 2pt 2pt @@ -186,14 +193,14 @@ FROM dbo.tbl_setup_missing_msi_msp_packages - + true true - Package Name + File Is Present In Cache But Likely Corrupt + + + + + + + + MediumSlateBlue + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + ProductVersion + + + + @@ -228,14 +276,14 @@ FROM dbo.tbl_setup_missing_msi_msp_packages - + true true - Expected Installer Cache File + Package Name @@ -295,7 +343,7 @@ FROM dbo.tbl_setup_missing_msi_msp_packages ProductName @@ -307,18 +355,19 @@ FROM dbo.tbl_setup_missing_msi_msp_packages 2pt + true - + true true - =Fields!Version.Value + =Fields!ExpectedInstallerCacheFile.Value - 2pt 2pt 2pt 2pt + true - + true true - =Fields!PackageName.Value + =Fields!FileIsPresentInCacheButLikelyCorrupt.Value + + + + + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + true + true + + + + + =Fields!ProductVersion.Value + + + + @@ -379,18 +464,19 @@ FROM dbo.tbl_setup_missing_msi_msp_packages 2pt + true - + true true - =Fields!ExpectedInstallerCacheFile.Value + =Fields!PackageName.Value @@ -415,6 +501,7 @@ FROM dbo.tbl_setup_missing_msi_msp_packages 2pt + true @@ -427,6 +514,7 @@ FROM dbo.tbl_setup_missing_msi_msp_packages + @@ -452,15 +540,19 @@ FROM dbo.tbl_setup_missing_msi_msp_packages DataSet1 0.73208in 0.73208in - 11.07292in + 13.77084in 1 + + - 11.71875in + 14.17709in 1in 1in diff --git a/RowsetImportEngine/TextRowsets.xml b/RowsetImportEngine/TextRowsets.xml index e514c5a..d3db094 100644 --- a/RowsetImportEngine/TextRowsets.xml +++ b/RowsetImportEngine/TextRowsets.xml @@ -4349,12 +4349,13 @@ - + - + + + - diff --git a/sqlnexus/PerfStatsAnalysis.sql b/sqlnexus/PerfStatsAnalysis.sql index 8260148..a137d62 100644 --- a/sqlnexus/PerfStatsAnalysis.sql +++ b/sqlnexus/PerfStatsAnalysis.sql @@ -7161,15 +7161,19 @@ BEGIN ) BEGIN - DECLARE @InstCacheFiles VARCHAR(8000) - SELECT @InstCacheFiles = COALESCE(@InstCacheFiles + CHAR(13) + CHAR(10) , '') + ISNULL([ExpectedInstallerCacheFile], '') + DECLARE @InstCacheFiles VARCHAR(8000), @InstCacheCorruptFiles VARCHAR(8000) + SELECT @InstCacheFiles = COALESCE(@InstCacheFiles + CHAR(13) + CHAR(10) , '') + ISNULL([ExpectedInstallerCacheFile], ''), + @InstCacheCorruptFiles = COALESCE(@InstCacheCorruptFiles + CHAR(13) + CHAR(10) , '') + ISNULL([FileIsPresentInCacheButLikelyCorrupt], '') FROM dbo.tbl_setup_missing_msi_msp_packages UPDATE dbo.tbl_AnalysisSummary SET [Status] = 1, [Description] = 'The following SQL Server MSI/MSPs are missing from the system. These can cause various CU or SP upgrade issues or unexpected behaviors: ' - + CHAR(13) + CHAR(10) + @InstCacheFiles + CHAR(13) + CHAR(10) + 'Be sure to use the linked article to resolve the missing MSI/MSP issues.' + + CHAR(13) + CHAR(10) + @InstCacheFiles + CHAR(13) + CHAR(10) + + 'And the following SQL Server MSI/MSPs are possibly corrupt: ' + + @InstCacheCorruptFiles + + CHAR(13) + CHAR(10) + 'Be sure to use the linked article to resolve the missing MSI/MSP issues.' WHERE [Name] = OBJECT_NAME(@@PROCID); END; END; diff --git a/sqlnexus/Reports/Missing_MSIs_or_MSPs_C.rdlC b/sqlnexus/Reports/Missing_MSIs_or_MSPs_C.rdlC index 167cfde..63bb4bf 100644 --- a/sqlnexus/Reports/Missing_MSIs_or_MSPs_C.rdlC +++ b/sqlnexus/Reports/Missing_MSIs_or_MSPs_C.rdlC @@ -19,9 +19,10 @@ DataSource_Private SELECT ProductName, - Version, - PackageName, - ExpectedInstallerCacheFile + ExpectedInstallerCacheFile, + FileIsPresentInCacheButLikelyCorrupt, + ProductVersion, + PackageName FROM dbo.tbl_setup_missing_msi_msp_packages true @@ -30,8 +31,8 @@ FROM dbo.tbl_setup_missing_msi_msp_packages ProductName System.String - - Version + + FileIsPresentInCacheButLikelyCorrupt System.String @@ -42,6 +43,10 @@ FROM dbo.tbl_setup_missing_msi_msp_packages ExpectedInstallerCacheFile System.String + + ProductVersion + System.String + @@ -87,13 +92,16 @@ FROM dbo.tbl_setup_missing_msi_msp_packages 3.13542in - 1.23958in + 3.33333in - 2.79167in + 3.27083in + + + 1.23958in - 3.90625in + 2.79167in @@ -144,14 +152,14 @@ FROM dbo.tbl_setup_missing_msi_msp_packages - + true true - Version + Expected Installer Cache File @@ -175,7 +183,6 @@ FROM dbo.tbl_setup_missing_msi_msp_packages MediumSlateBlue - 2pt 2pt 2pt @@ -186,14 +193,14 @@ FROM dbo.tbl_setup_missing_msi_msp_packages - + true true - Package Name + File Is Present In Cache But Likely Corrupt + + + + + + + + MediumSlateBlue + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + ProductVersion + + + + @@ -228,14 +276,14 @@ FROM dbo.tbl_setup_missing_msi_msp_packages - + true true - Expected Installer Cache File + Package Name @@ -295,7 +343,7 @@ FROM dbo.tbl_setup_missing_msi_msp_packages ProductName @@ -307,18 +355,19 @@ FROM dbo.tbl_setup_missing_msi_msp_packages 2pt + true - + true true - =Fields!Version.Value + =Fields!ExpectedInstallerCacheFile.Value - 2pt 2pt 2pt 2pt + true - + true true - =Fields!PackageName.Value + =Fields!FileIsPresentInCacheButLikelyCorrupt.Value + + + + + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + true + true + + + + + =Fields!ProductVersion.Value + + + + @@ -379,18 +464,19 @@ FROM dbo.tbl_setup_missing_msi_msp_packages 2pt + true - + true true - =Fields!ExpectedInstallerCacheFile.Value + =Fields!PackageName.Value @@ -415,6 +501,7 @@ FROM dbo.tbl_setup_missing_msi_msp_packages 2pt + true @@ -427,6 +514,7 @@ FROM dbo.tbl_setup_missing_msi_msp_packages + @@ -452,15 +540,19 @@ FROM dbo.tbl_setup_missing_msi_msp_packages DataSet1 0.73208in 0.73208in - 11.07292in + 13.77084in 1 + + - 11.71875in + 14.17709in 1in 1in diff --git a/sqlnexus/TextRowsets.xml b/sqlnexus/TextRowsets.xml index e514c5a..d3db094 100644 --- a/sqlnexus/TextRowsets.xml +++ b/sqlnexus/TextRowsets.xml @@ -4349,12 +4349,13 @@ - + - + + + -