Merge pull request #5 from gmarginet/2-sql-string-can-not-be-generated-when-a-defined-parameter-is-used-more-then-once-in-the-query

Fix issue with using parameter more then once in query

Author: gmarginet

src/SqlQueryTools/FileHandlers/SqlSaveHandler.cs

@@ -86,7 +86,8 @@ private async Task GenerateSqlConstStringAsync(string inputFilePath)
 
             var hasDeclarationSection = sqlParserTokens.Any(x => x.TokenType == TSqlTokenType.SingleLineComment && x.Text == options.EndOfParameterDeclarationMarker);
             var endOfParameterDeclarationMarkerFound = false;
-            var parameterNames = new List<string>();
+            var declaredParameters = new Dictionary<string,string>();
+            var foundParameterDeclaration = String.Empty;
             var sqlCodeBuilder = new StringBuilder();
             var whiteSpaceBuffer = new StringBuilder();
             foreach (var token in sqlParserTokens)
@@ -101,9 +102,16 @@ private async Task GenerateSqlConstStringAsync(string inputFilePath)
 
                     if (token.TokenType == TSqlTokenType.Variable)
                     {
-                        parameterNames.Add(token.Text);
+                        foundParameterDeclaration = token.Text;
+                        declaredParameters.Add(foundParameterDeclaration, string.Empty);
                         continue;
                     }
+
+                    if (token.TokenType == TSqlTokenType.Identifier && !string.IsNullOrEmpty(foundParameterDeclaration))
+                    {
+                        declaredParameters[foundParameterDeclaration] = token.Text;
+                        foundParameterDeclaration = string.Empty;
+                    }
                 }
                 else
                 {
@@ -131,6 +139,15 @@ private async Task GenerateSqlConstStringAsync(string inputFilePath)
                         continue;
                     }
 
+                    if (token.TokenType == TSqlTokenType.Variable)
+                    {
+                        if (!declaredParameters.ContainsKey(token.Text))
+                        {
+                            await outputPane.WriteLineAsync($"\tVariable {token.Text} is used in the query, but it is not defined in the 'Parameter Declarat");
+                            return;
+                        }
+                    }
+
                     if (whiteSpaceBuffer.Length > 0)
                     {
                         sqlCodeBuilder.Append(whiteSpaceBuffer.ToString());
@@ -155,7 +172,13 @@ private async Task GenerateSqlConstStringAsync(string inputFilePath)
                     await conn.OpenAsync();
                     try
                     {
-                        conn.Query($"DECLARE @sql NVARCHAR(MAX) = '{sqlCode.Replace("'", "''")}'; EXEC sp_describe_first_result_set @sql;");
+                        //conn.Query($"DECLARE @sql NVARCHAR(MAX) = '{sqlCode.Replace("'", "''")}'; EXEC sp_describe_first_result_set @sql;");
+                        //conn.Query($"DECLARE @sql NVARCHAR(MAX) = '{sqlCode.Replace("'", "''")}'; DECLARE @params NVARCHAR(MAX) = '{string.Join(", ", declaredParameters.Select(x => $"{x.Key} {x.Value}"))}';  EXEC sp_describe_first_result_set @sql, @params;").ToList();
+                        var queryBuilder = new StringBuilder();
+                        queryBuilder.AppendLine($"DECLARE @sql NVARCHAR(MAX) = '{sqlCode.Replace("'", "''")}';");
+                        queryBuilder.AppendLine($"DECLARE @params NVARCHAR(MAX) = '{string.Join(", ", declaredParameters.Select(x => $"{x.Key} {x.Value}"))}';");
+                        queryBuilder.AppendLine("EXEC sp_describe_first_result_set @sql, @params;");
+                        conn.Query(queryBuilder.ToString()).ToList();
                     }
                     catch (SqlException ex)
                     {
@@ -211,7 +234,7 @@ private async Task GenerateSqlConstStringAsync(string inputFilePath)
             contentBuilder.AppendLine($"\t{{");
             contentBuilder.AppendLine($"\t\tpublic const string Query = @\"{sqlCode}\";");
 
-            foreach (var name in parameterNames)
+            foreach (var name in declaredParameters.Keys)
             {
                 contentBuilder.AppendLine();
                 contentBuilder.AppendLine($"\t\tpublic const string {name} = @\"{name}\";");

src/SqlQueryTools/VSCommandTable.vsct

@@ -20,6 +20,7 @@
       <Menu guid="SqlQueryTools" id="SqlQueryToolsMenu" priority="0x0100" type="Menu">
         <Parent guid="SqlQueryTools" id="SqlQueryToolsMenuGroup"/>
         <CommandFlag>DefaultInvisible</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
         <Strings>
           <ButtonText>Sql Query Tools</ButtonText>
         </Strings>

src/SqlQueryTools/source.extension.cs

@@ -11,7 +11,7 @@ internal sealed partial class Vsix
         public const string Name = "SqlQueryTools";
         public const string Description = @"Generate class with string based on Sql file content.";
         public const string Language = "en-US";
-        public const string Version = "1.1";
+        public const string Version = "1.2";
         public const string Author = "Gert Marginet";
         public const string Tags = "";
     }

src/SqlQueryTools/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="SqlQueryTools.46119220-B112-4974-BF62-BA76F5548B13" Version="1.1" Language="en-US" Publisher="Gert Marginet" />
+        <Identity Id="SqlQueryTools.46119220-B112-4974-BF62-BA76F5548B13" Version="1.2" Language="en-US" Publisher="Gert Marginet" />
         <DisplayName>SqlQueryTools</DisplayName>
         <Description xml:space="preserve">Generate class with string based on Sql file content.</Description>
         <MoreInfo>http://github.com/gmarginet/SqlQueryTools</MoreInfo>