Added better checks for finalizable status (at least for T-SQL).

Author: James Craig

src/SQLHelper.DB/HelperClasses/Command.cs

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 using BigBook;
+using SQLHelper.DB.HelperClasses;
 using SQLHelper.HelperClasses.Interfaces;
 using System;
 using System.Collections.Generic;
@@ -41,12 +42,21 @@ public class Command<TCallbackData> : ICommand
         /// <param name="callbackObject">Object</param>
         public Command(Action<ICommand, IList<dynamic>, TCallbackData> callBack, TCallbackData callbackObject, string sqlCommand, CommandType commandType, IParameter[] parameters)
         {
-            SQLCommand = sqlCommand;
+            SQLCommand = (sqlCommand ?? "");
             CommandType = commandType;
             CallBack = callBack ?? ((x, y, z) => { });
             Object = callbackObject;
             Parameters = parameters ?? new IParameter[0];
-            Finalizable = (sqlCommand ?? "").ToUpperInvariant().Contains("SELECT");
+            if (Parameters.Any(x => x.ParameterStarter == "@"))
+            {
+                var TempParser = new SelectFinder();
+                SQLParser.Parser.Parse(SQLCommand, TempParser, SQLParser.Enums.SQLType.TSql);
+                Finalizable = TempParser.StatementFound;
+            }
+            else
+            {
+                Finalizable = SQLCommand.ToUpperInvariant().Contains("SELECT");
+            }
         }
 
         /// <summary>
@@ -60,12 +70,21 @@ public Command(Action<ICommand, IList<dynamic>, TCallbackData> callBack, TCallba
         /// <param name="callbackObject">Object</param>
         public Command(Action<ICommand, IList<dynamic>, TCallbackData> callBack, TCallbackData callbackObject, string sqlCommand, CommandType commandType, string parameterStarter, object[] parameters)
         {
-            SQLCommand = sqlCommand;
+            SQLCommand = (sqlCommand ?? "");
             CommandType = commandType;
             Parameters = new List<IParameter>();
             CallBack = callBack ?? ((x, y, z) => { });
             Object = callbackObject;
-            Finalizable = (sqlCommand ?? "").ToUpperInvariant().Contains("SELECT");
+            if (parameterStarter == "@")
+            {
+                var TempParser = new SelectFinder();
+                SQLParser.Parser.Parse(SQLCommand, TempParser, SQLParser.Enums.SQLType.TSql);
+                Finalizable = TempParser.StatementFound;
+            }
+            else
+            {
+                Finalizable = SQLCommand.ToUpperInvariant().Contains("SELECT");
+            }
             if (parameters != null)
             {
                 foreach (object CurrentParameter in parameters)

src/SQLHelper.DB/HelperClasses/SelectFinder.cs

@@ -0,0 +1,45 @@
+/*
+Copyright 2016 James Craig
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+using Antlr4.Runtime.Misc;
+using SQLParser.Parsers.TSql;
+
+namespace SQLHelper.DB.HelperClasses
+{
+    /// <summary>
+    /// Finds selects within SQL code.
+    /// </summary>
+    /// <seealso cref="TSqlParserBaseListener"/>
+    public class SelectFinder : TSqlParserBaseListener
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether a select [statement found].
+        /// </summary>
+        /// <value><c>true</c> if [statement found]; otherwise, <c>false</c>.</value>
+        public bool StatementFound { get; set; }
+
+        /// <summary>
+        /// Enter a parse tree produced by <see cref="M:SQLParser.Parsers.TSql.TSqlParser.dml_clause"/>.
+        /// <para>The default implementation does nothing.</para>
+        /// </summary>
+        /// <param name="context">The parse tree.</param>
+        public override void EnterDml_clause([NotNull] TSqlParser.Dml_clauseContext context)
+        {
+            StatementFound |= context.select_statement() != null;
+            base.EnterDml_clause(context);
+        }
+    }
+}

src/SQLHelper.DB/SQLHelper.DB.csproj

@@ -27,10 +27,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="SQLParser" Version="1.0.2" />
     <PackageReference Include="System.Data.Common" Version="4.3.0" />
     <PackageReference Include="System.Data.SqlClient" Version="4.3.1" />
     <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
-    <PackageReference Include="BigBook" Version="1.0.21" />
+    <PackageReference Include="BigBook" Version="1.0.24" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.2" />
     <PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
   </ItemGroup>

test/SQLHelper.Tests/HelperClasses/CommandTests.cs

@@ -9,6 +9,15 @@ namespace SQLHelper.Tests.HelperClasses
 {
     public class CommandTests
     {
+        [Fact]
+        public void CanFinalizeIfTest()
+        {
+            StringBuilder Builder = new StringBuilder();
+            var TestItem = new Command<int>((x, y, z) => { Builder.Append(z); }, 10, "IF NOT EXISTS (SELECT * FROM [dbo].[AllReferencesAndID_ManyToManyPropertiesWithCascade] WHERE [dbo].[AllReferencesAndID_ManyToManyPropertiesWithCascade].[AllReferencesAndID_ID_] = 4 AND [dbo].[AllReferencesAndID_ManyToManyPropertiesWithCascade].[ManyToManyPropertiesWithCascade_ID_] = 4) BEGIN INSERT INTO [dbo].[AllReferencesAndID_ManyToManyPropertiesWithCascade]([dbo].[AllReferencesAndID_ManyToManyPropertiesWithCascade].[AllReferencesAndID_ID_],[dbo].[AllReferencesAndID_ManyToManyPropertiesWithCascade].[ManyToManyPropertiesWithCascade_ID_]) VALUES (4,4) END;", CommandType.Text, "@", new object[] { 1, 2, 3 });
+            Assert.False(TestItem.Finalizable);
+            TestItem = new Command<int>((x, y, z) => { Builder.Append(z); }, 10, "IF NOT EXISTS (SELECT * FROM [dbo].[AllReferencesAndID_ManyToManyPropertiesWithCascade] WHERE [dbo].[AllReferencesAndID_ManyToManyPropertiesWithCascade].[AllReferencesAndID_ID_] = 4 AND [dbo].[AllReferencesAndID_ManyToManyPropertiesWithCascade].[ManyToManyPropertiesWithCascade_ID_] = 4) BEGIN SELECT * FROM Users END;", CommandType.Text, "@", new object[] { 1, 2, 3 });
+        }
+
         [Fact]
         public void Creation()
         {