Skip to content

Commit

Permalink
Fixes #167
Browse files Browse the repository at this point in the history
  • Loading branch information
ChristopherJennings committed Mar 15, 2018
1 parent d449744 commit cee4d91
Showing 1 changed file with 22 additions and 4 deletions.
26 changes: 22 additions & 4 deletions KInspector.Modules/Modules/General/ClassTableValidation.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using Kentico.KInspector.Core;

namespace Kentico.KInspector.Modules
Expand Down Expand Up @@ -35,29 +37,45 @@ public ModuleResults GetResults(IInstanceInfo instanceInfo)
// Retrieve data
var tablesWithoutClass = dbService.ExecuteAndGetTableFromFile("ClassTableValidationTables.sql");
tablesWithoutClass.TableName = "Database tables without Kentico Class";
var tablesWithoutClassCount = tablesWithoutClass.Select($"TABLE_NAME not in ({formattedWhitelist})").Count();

var classesWithoutTable = dbService.ExecuteAndGetTableFromFile("ClassTableValidationClasses.sql");
classesWithoutTable.TableName = "Kentico Classes without database table";
var classesWithoutTableCount = classesWithoutTable.Rows.Count;

// Merge data into result
var result = new DataSet("Non-matching Tables-Class entries");
if (tablesWithoutClass.Rows.Count > 0)

if (tablesWithoutClassCount > 0)
{
result.Merge(tablesWithoutClass);
}
if (classesWithoutTable.Rows.Count > 0)
if (classesWithoutTableCount > 0)
{
result.Merge(classesWithoutTable);
}

// Calculate total number of identified issues (if any)
int issues = tablesWithoutClass.Rows.Count + classesWithoutTable.Rows.Count;
int issues = tablesWithoutClassCount + classesWithoutTableCount;

return new ModuleResults
{
Result = result,
ResultComment = $"{issues} invalid entries found",
Status = (issues > 0) ? Status.Error : Status.Good
};
}

private List<string> GetTableWhitelist(Version version)
{
var whitelist = new List<string>();

if (version.Major >= 10)
{
whitelist.Add("CI_Migration");
}

return whitelist;
}
}
}

0 comments on commit cee4d91

Please sign in to comment.