Improve parameters parsing

Author: olsh

src/Sql.Analyzer.UnitTests/DapperParametersMatchingAnalyzerTests.cs

@@ -10,7 +10,7 @@ namespace Sql.Analyzer.UnitTests.Parsers
     public class SqlParserTests
     {
         [TestMethod]
-        public void FindSqlVariables_DeclareVariable_NotDetected()
+        public void FindSqlVariables_DeclareVariable()
         {
             var sql = 
                 @"DECLARE @ids udt_ids_list;
@@ -34,7 +34,7 @@ FROM dbo.table
         }
 
         [TestMethod]
-        public void FindSqlVariables_Identity_NotDetected()
+        public void FindSqlVariables_Identity()
         {
             var sql = 
                 @"SELECT id, @@IDENTITY 
@@ -46,5 +46,50 @@ FROM dbo.table
             Assert.AreEqual(1, parameters.Count);
             Assert.AreEqual("name", parameters.First());
         }
+
+        [TestMethod]
+        public void FindSqlVariables_IfStatement()
+        {
+            var sql =
+                @"declare @result tinyint = 0;
+
+                    IF @ip = 'unknown'
+                        SET @result = 0;
+                    ELSE
+                        SET @result = 1;
+
+                    select @result;";
+
+            var parameters = SqlParser.FindParameters(sql);
+
+            Assert.AreEqual(1, parameters.Count);
+            Assert.AreEqual("ip", parameters.First());
+        }
+
+        [TestMethod]
+        public void FindSqlVariables_MultipleDeclaration()
+        {
+            var sql =
+                @"DECLARE  @Planner1 VARCHAR(50) = '2566927',
+                 @Planner2 varchar(10) = '12201704',
+                 @OtherVar int = 42
+                 SELECT * FROM table";
+
+            var parameters = SqlParser.FindParameters(sql);
+
+            Assert.AreEqual(0, parameters.Count);
+        }
+
+        [TestMethod]
+        public void FindSqlVariables_ExecuteStoreProcedure()
+        {
+            var sql = @"EXEC sp_api_user_GetServicesSchedule @id = @uid, @adminID = @aid";
+
+            var parameters = SqlParser.FindParameters(sql);
+
+            Assert.AreEqual(2, parameters.Count);
+            Assert.IsTrue(parameters.Contains("uid"));
+            Assert.IsTrue(parameters.Contains("aid"));
+        }
     }
 }

src/Sql.Analyzer.UnitTests/Parsers/SqlParserTests.cs

@@ -5,21 +5,33 @@ namespace Sql.Analyzer.Parsers
 {
     internal static class SqlParser
     {
+        private static readonly Regex SqlDeclareRegex = new Regex(
+            @"declare\s(?<declaration>.*?)(select|update|delete|insert|merge|if|begin|set|;)",
+            RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline);
+
         private static readonly Regex SqlParameterRegex = new Regex(@"(?<!@)@(?<variable>\w+)", RegexOptions.Compiled);
-        private static readonly Regex SqlDeclareRegex = new Regex(@"declare\s(?<declaration>.*?)(select|update|delete|insert|merge)", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.Singleline);
+
+        private static readonly Regex SqlParameterAssignmentRegex = new Regex(@"@(?<declaration>\w+)\s*=\s*@", RegexOptions.Compiled);
 
         public static ICollection<string> FindParameters(string sql)
         {
             var sqlVariables = new HashSet<string>();
             var declaredVariables = new HashSet<string>();
             foreach (Match match in SqlDeclareRegex.Matches(sql))
             {
-                foreach (Match declaration in SqlParameterRegex.Matches(match.Groups["declaration"].Value))
+                foreach (Match declaration in SqlParameterRegex.Matches(
+                    match.Groups["declaration"]
+                        .Value))
                 {
                     declaredVariables.Add(declaration.Groups["variable"].Value);
                 }
             }
 
+            foreach (Match match in SqlParameterAssignmentRegex.Matches(sql))
+            {
+                declaredVariables.Add(match.Groups["declaration"].Value);
+            }
+
             var matches = SqlParameterRegex.Matches(sql);
             foreach (Match match in matches)
             {

src/Sql.Analyzer/Sql.Analyzer/Parsers/SqlParser.cs

@@ -15,9 +15,9 @@
     <Copyright>Copyright</Copyright>
     <PackageTags>analyzers, sql, dapper</PackageTags>
     <NoPackageAnalysis>true</NoPackageAnalysis>
-    <Version>0.0.3</Version>
-    <AssemblyVersion>0.0.3.0</AssemblyVersion>
-    <FileVersion>0.0.3.0</FileVersion>
+    <Version>0.0.4</Version>
+    <AssemblyVersion>0.0.4.0</AssemblyVersion>
+    <FileVersion>0.0.4.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>