chore: refactor for sonarqube issues
SonarQube Analysis / sonarqube (pull_request) Successful in 6m3s

This commit is contained in:
Thom Lamb
2026-05-22 17:13:31 -05:00
parent 063d5a7ba0
commit 012e693fe1
22 changed files with 522 additions and 461 deletions
@@ -166,14 +166,7 @@ internal static class CollectionReportWriter
var allParamNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
foreach (var query in queryBreakdowns)
{
foreach (var param in query.ParameterList)
{
allParamNames.Add(param.Name);
}
foreach (var paramName in query.Parameters.Keys)
{
allParamNames.Add(paramName);
}
allParamNames.UnionWith(GetAllParameterNames(query));
}
var parameters = allParamNames.OrderBy(p => p).ToList();
@@ -199,19 +192,7 @@ internal static class CollectionReportWriter
sb.AppendLine($" style {queryNode} fill:{format.QueryNodeFill}");
// Collect all parameter names used by this query
var queryParamNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
// Add from ParameterList (parsed parameters)
foreach (var param in query.ParameterList)
{
queryParamNames.Add(param.Name);
}
// Add from Parameters dictionary (manually added parameters)
foreach (var paramName in query.Parameters.Keys)
{
queryParamNames.Add(paramName);
}
var queryParamNames = new HashSet<string>(GetAllParameterNames(query), StringComparer.OrdinalIgnoreCase);
// Connect parameters to this query
foreach (var paramName in queryParamNames)
@@ -233,6 +214,23 @@ internal static class CollectionReportWriter
return sb.ToString();
}
/// <summary>
/// Yields every parameter name referenced by a query, combining parsed parameters
/// (<see cref="QueryBreakdown.ParameterList"/>) and manually added ones (<c>Parameters</c> dictionary).
/// </summary>
private static IEnumerable<string> GetAllParameterNames(QueryBreakdown query)
{
foreach (var param in query.ParameterList)
{
yield return param.Name;
}
foreach (var paramName in query.Parameters.Keys)
{
yield return paramName;
}
}
/// <summary>
/// Renders the per-query composition report. The optional <paramref name="appendExtra"/> hook lets a
/// dialect append additional per-query sections (for example, Snowflake feature notes).
@@ -43,9 +43,10 @@ public class SqlStatementGenerator
var queryBreakdown = sqlBreakdown as IQueryBreakdown;
var tableNames = new List<string>();
if (queryBreakdown != null && !string.IsNullOrWhiteSpace(queryBreakdown.FromClause?.ToString()))
var fromClauseText = queryBreakdown?.FromClause?.ToString();
if (!string.IsNullOrWhiteSpace(fromClauseText))
{
tableNames.Add(queryBreakdown.FromClause.ToString());
tableNames.Add(fromClauseText);
}
return _baseGenerator.GenerateEntityRelationshipDiagram(tableNames, title);