Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
edc4d5c087 | ||
|
|
507c466b5d |
@@ -45,7 +45,7 @@ namespace SQLLinter.CLI
|
||||
["SetVariable"] = Common.RuleViolationSeverity.Critical,
|
||||
["CreateProcedureInDbo"] = Common.RuleViolationSeverity.Warning,
|
||||
},
|
||||
GenerateDetails = true,
|
||||
GenerateDetails = false,
|
||||
};
|
||||
|
||||
//var linter = new Linter(con, rep);
|
||||
@@ -63,7 +63,7 @@ namespace SQLLinter.CLI
|
||||
|
||||
Dictionary<string, Stream> files = new();
|
||||
|
||||
for (int i = 0; i < 15; i++)
|
||||
for (int i = 0; i < 5; i++)
|
||||
{
|
||||
files[name + i + ".sql"] = reader.BaseStream;
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ public class SqlRuleVisitor : IRuleVisitor
|
||||
if (sqlFragment == null) return;
|
||||
|
||||
//Dictionary<TSqlFragment, TSqlFragment?>? parentMap = generateDetails ? ParentMapBuilder.Build(sqlFragment) : null;
|
||||
Dictionary<TSqlFragment, TSqlFragment?>? parentMap = new Dictionary<TSqlFragment, TSqlFragment?>();
|
||||
Dictionary<TSqlFragment, TSqlFragment?>? parentMap = generateDetails ? new Dictionary<TSqlFragment, TSqlFragment?>() : null;
|
||||
|
||||
var ruleExceptions = ignoredRules as IRuleException[] ?? ignoredRules.ToArray();
|
||||
if (errors.Any())
|
||||
|
||||
@@ -17,14 +17,20 @@ public class ConditionalBeginEndRule : BaseRuleVisitor, IRule
|
||||
|
||||
public override void Visit(IfStatement node)
|
||||
{
|
||||
if (node.ThenStatement is not BeginEndBlockStatement)
|
||||
if (node.ThenStatement != null && node.ThenStatement is not BeginEndBlockStatement && node.ThenStatement is not TryCatchStatement)
|
||||
{
|
||||
AddViolation(node);
|
||||
if (node.ThenStatement.StartLine != node.StartLine || node.ScriptTokenStream.Where(t => t.Offset <= node.ThenStatement.StartOffset + node.ThenStatement.FragmentLength).Max(t => t.Line) != node.StartLine)
|
||||
{
|
||||
AddViolation(node.ThenStatement);
|
||||
}
|
||||
}
|
||||
|
||||
if (node.ElseStatement != null && node.ElseStatement is not BeginEndBlockStatement && node.ElseStatement is not IfStatement)
|
||||
if (node.ElseStatement != null && node.ElseStatement is not BeginEndBlockStatement && node.ElseStatement is not TryCatchStatement && node.ElseStatement is not IfStatement)
|
||||
{
|
||||
AddViolation(Name, Text, GetLineNumber(node.ElseStatement), GetColumnNumber(node.ElseStatement));
|
||||
if (node.ElseStatement.StartLine != node.StartLine || node.ScriptTokenStream.Where(t => t.Offset <= node.ElseStatement.StartOffset + node.ElseStatement.FragmentLength).Max(t => t.Line) != node.StartLine)
|
||||
{
|
||||
AddViolation(node.ElseStatement);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -20,6 +20,6 @@ public class DeleteWhereRule : BaseRuleVisitor, IRule
|
||||
.Select(t => t.Text)
|
||||
);
|
||||
|
||||
AddViolation(node, name);
|
||||
AddViolation(node.Target, name);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ public class TempTableModificationRule : BaseRuleVisitor
|
||||
{
|
||||
if (node.UpdateSpecification.Target is NamedTableReference tbl && tbl.SchemaObject.BaseIdentifier.Value.StartsWith("#"))
|
||||
{
|
||||
AddViolation(node, SQLHelpers.ObjectGetFullName(tbl.SchemaObject));
|
||||
AddViolation(node.UpdateSpecification.Target, SQLHelpers.ObjectGetFullName(tbl.SchemaObject));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ public class TempTableModificationRule : BaseRuleVisitor
|
||||
{
|
||||
if (node.DeleteSpecification.Target is NamedTableReference tbl && tbl.SchemaObject.BaseIdentifier.Value.StartsWith("#"))
|
||||
{
|
||||
AddViolation(node, SQLHelpers.ObjectGetFullName(tbl.SchemaObject));
|
||||
AddViolation(node.DeleteSpecification.Target, SQLHelpers.ObjectGetFullName(tbl.SchemaObject));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ public class TempTableModificationRule : BaseRuleVisitor
|
||||
{
|
||||
if (node.SchemaObjectName.BaseIdentifier.Value.StartsWith("#"))
|
||||
{
|
||||
AddViolation(node, SQLHelpers.ObjectGetFullName(node.SchemaObjectName));
|
||||
AddViolation(node.SchemaObjectName, SQLHelpers.ObjectGetFullName(node.SchemaObjectName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,6 +23,6 @@ public class UpdateWhereRule : BaseRuleVisitor, IRule
|
||||
.Select(t => t.Text)
|
||||
);
|
||||
|
||||
AddViolation(node, name);
|
||||
AddViolation(node.Target, name);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user