Изменено формирование деталировки: зависимость от строк, а не от родителя
All checks were successful
CI / build-test (push) Successful in 38s
Release / pack-and-publish (release) Successful in 35s

This commit is contained in:
FrigaT
2025-12-29 01:10:17 +03:00
parent 19c2357c04
commit 7fb11364c4
10 changed files with 37 additions and 16 deletions

View File

@@ -43,6 +43,7 @@ namespace SQLLinter.CLI
["UpdateWhere"] = Common.RuleViolationSeverity.Critical,
["UpperLower"] = Common.RuleViolationSeverity.Critical,
["SetVariable"] = Common.RuleViolationSeverity.Critical,
["CreateProcedureInDbo"] = Common.RuleViolationSeverity.Warning,
},
GenerateDetails = true,
};

View File

@@ -83,8 +83,12 @@ public abstract class BaseRuleVisitor : TSqlFragmentVisitor, IRule
return string.Format(this.Text, param);
}
private TSqlFragment? FindContextBlock(TSqlFragment node)
{
if (_parents == null) return null;
return node;
var current = node;
while (current != null)
@@ -139,7 +143,6 @@ public abstract class BaseRuleVisitor : TSqlFragmentVisitor, IRule
}
// Вспомогательные классы
public class ExtractedBlock
{
@@ -165,13 +168,13 @@ public abstract class BaseRuleVisitor : TSqlFragmentVisitor, IRule
protected ExtractedBlock? ExtractBlock(TSqlFragment? node, TSqlFragment errorNode)
{
if (node == null || node.ScriptTokenStream == null)
if (node == null || errorNode.ScriptTokenStream == null)
return null;
var endLine = node.ScriptTokenStream.Where(t => t.Offset < node.StartOffset + node.FragmentLength).Max(t => t.Line) + 2;
var endLine = errorNode.ScriptTokenStream.Where(t => t.Offset < node.StartOffset + node.FragmentLength).Max(t => t.Line) + 2;
// 1. Получаем токены для блока
var tokens = node.ScriptTokenStream
var tokens = errorNode.ScriptTokenStream
.Where(t => t.Line >= node.StartLine - 2 &&
t.Line <= endLine)
.ToList();

View File

@@ -13,5 +13,6 @@ public interface IRule
int DynamicSqlStartLine { get; set; }
IEnumerable<Violation> Analyze(TSqlFragment fragment);
void SetParents(Dictionary<TSqlFragment, TSqlFragment?>? parents);
}

View File

@@ -3,7 +3,6 @@ using SQLLinter.Common;
using SQLLinter.Core.Interfaces;
using SQLLinter.Infrastructure.Configuration.Overrides;
using SQLLinter.Infrastructure.Interfaces;
using SQLLinter.Infrastructure.Rules;
using SQLLinter.Infrastructure.Rules.RuleExceptions;
using SQLLinter.Infrastructure.Rules.RuleViolations;
using System.Data;
@@ -39,7 +38,8 @@ public class SqlRuleVisitor : IRuleVisitor
if (sqlFragment == null) return;
Dictionary<TSqlFragment, TSqlFragment?>? parentMap = generateDetails ? ParentMapBuilder.Build(sqlFragment) : null;
//Dictionary<TSqlFragment, TSqlFragment?>? parentMap = generateDetails ? ParentMapBuilder.Build(sqlFragment) : null;
Dictionary<TSqlFragment, TSqlFragment?>? parentMap = new Dictionary<TSqlFragment, TSqlFragment?>();
var ruleExceptions = ignoredRules as IRuleException[] ?? ignoredRules.ToArray();
if (errors.Any())

View File

@@ -12,7 +12,7 @@ public class AlterProcedureInDboRule : BaseRuleVisitor
{
if (node.ProcedureReference.Name.SchemaIdentifier?.Value.Equals("dbo", StringComparison.OrdinalIgnoreCase) == true)
{
AddViolation(node, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
AddViolation(node.ProcedureReference.Name.SchemaIdentifier, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
}
}
}

View File

@@ -12,14 +12,14 @@ public class CreateProcedureInDboRule : BaseRuleVisitor
{
if (node.ProcedureReference.Name.SchemaIdentifier?.Value.Equals("dbo", StringComparison.OrdinalIgnoreCase) == true)
{
AddViolation(node, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
AddViolation(node.ProcedureReference.Name.SchemaIdentifier, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
}
}
public override void Visit(CreateOrAlterProcedureStatement node)
{
if (node.ProcedureReference.Name.SchemaIdentifier?.Value.Equals("dbo", StringComparison.OrdinalIgnoreCase) == true)
{
AddViolation(node, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
AddViolation(node.ProcedureReference.Name.SchemaIdentifier, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
}
}
}

View File

@@ -25,6 +25,6 @@ public class ExecuteAsOwnerRule : BaseRuleVisitor
}
}
AddViolation(node, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
AddViolation(node.ProcedureReference.Name, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
}
}

View File

@@ -20,9 +20,9 @@ public class HeaderCommentRule : BaseRuleVisitor
public override void Visit(CreateOrAlterTriggerStatement node) => private_visit(node, SQLHelpers.ObjectGetFullName(node.Name));
public override void Visit(CreateViewStatement node) => private_visit(node, "");
public override void Visit(CreateViewStatement node) => private_visit(node, SQLHelpers.ObjectGetFullName(node.SchemaObjectName));
public override void Visit(CreateOrAlterViewStatement node) => private_visit(node, "");
public override void Visit(CreateOrAlterViewStatement node) => private_visit(node, SQLHelpers.ObjectGetFullName(node.SchemaObjectName));
private void private_visit(TSqlFragment node, string name)
{
@@ -39,8 +39,24 @@ public class HeaderCommentRule : BaseRuleVisitor
if (prevToken == null ||
prevToken.TokenType != TSqlTokenType.SingleLineComment && prevToken.TokenType != TSqlTokenType.MultilineComment
)
{
if (node is ProcedureStatementBody proc)
{
AddViolation(proc.ProcedureReference.Name, name);
}
else if (node is ViewStatementBody view)
{
AddViolation(view.SchemaObjectName, name);
}
else if (node is TriggerStatementBody tr)
{
AddViolation(tr.Name, name);
}
else
{
AddViolation(node, name);
}
}
}
}

View File

@@ -11,7 +11,7 @@ public class InsertStarRule : BaseRuleVisitor
{
if (node.InsertSpecification.Columns.Count == 0) // INSERT без перечисления колонок
{
AddViolation(node);
AddViolation(node.InsertSpecification.Target);
}
}
}

View File

@@ -12,7 +12,7 @@ public class ProcedureLoggingRule : BaseRuleVisitor
public override void Visit(CreateOrAlterProcedureStatement node) => check(node, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
public override void Visit(AlterProcedureStatement node) => check(node, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
private void check(TSqlStatement node, string name)
private void check(ProcedureStatementBody node, string name)
{
var tokens = node.ScriptTokenStream;
@@ -35,7 +35,7 @@ public class ProcedureLoggingRule : BaseRuleVisitor
if (!hasDebugLog || !hasLabelFinish)
{
AddViolation(node, name);
AddViolation(node.ProcedureReference.Name, name);
}
}
}