From 31d9c8200c0423ae43bb567aa2c17d2fa71a4743 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 11 Feb 2021 17:37:19 +0000 Subject: [PATCH] --- server/AyaNova/util/DbUtil.cs | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/server/AyaNova/util/DbUtil.cs b/server/AyaNova/util/DbUtil.cs index 5f802368..0923fed3 100644 --- a/server/AyaNova/util/DbUtil.cs +++ b/server/AyaNova/util/DbUtil.cs @@ -497,9 +497,14 @@ namespace AyaNova.Util /////////////////////////////////////////// // Ensure the db is not modified // - internal static async Task CheckFingerPrintAsync(long ExpectedColumns, long ExpectedIndexes, - long ExpectedCheckConstraints, long ExpectedForeignKeyConstraints, - long ExpectedViews, long ExpectedRoutines, ILogger _log) + internal static async Task CheckFingerPrintAsync( + long ExpectedColumns, + long ExpectedIndexes, + long ExpectedCheckConstraints, + long ExpectedForeignKeyConstraints, + long ExpectedViews, + long ExpectedRoutines, + ILogger _log) { _log.LogDebug("Checking DB integrity"); @@ -665,12 +670,18 @@ namespace AyaNova.Util - if (ExpectedColumns != actualColumns || ExpectedIndexes != actualIndexes) + if (ExpectedColumns != actualColumns + || ExpectedIndexes != actualIndexes + || ExpectedCheckConstraints != actualCheckConstraints + || ExpectedForeignKeyConstraints != actualForeignKeyConstraints + || ExpectedRoutines != actualRoutines + || ExpectedViews != actualViews) { - var err = string.Format("E1030 - Database integrity check failed (C{0}I{1})", actualColumns, actualIndexes); + var err = $"E1030 - Database integrity check failed (C{actualColumns}:I{actualIndexes}:CC{actualCheckConstraints}:FC{actualForeignKeyConstraints}:R{actualRoutines}:V{actualViews})"; _log.LogCritical(err); throw new ApplicationException(err); } + return; } }