Do not ignore SET statements when collecting DML command text

Author: C0nquistadore

src/Dibix.Sdk/CodeGeneration/Formatter/SqlStatementFormatter.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Dibix.Sdk.Sql;
 using Microsoft.SqlServer.TransactSql.ScriptDom;
 
@@ -9,12 +8,7 @@ namespace Dibix.Sdk.CodeGeneration
     public abstract class SqlStatementFormatter : ISqlStatementFormatter
     {
         protected const int Indentation = 4;
-
-        private static readonly Type[] ExcludedTypes = 
-        {
-            typeof(PredicateSetStatement)
-        };
-
+        
         public bool StripWhiteSpace { get; set; }
 
         FormattedSqlStatement ISqlStatementFormatter.Format(SqlStatementDefinition statementDefinition, StatementList statementList)
@@ -28,7 +22,7 @@ FormattedSqlStatement ISqlStatementFormatter.Format(SqlStatementDefinition state
 
         protected void CollectStatements(StatementList statementList, Action<TSqlStatement, int, int> statementHandler, Action<TSqlParserToken> tokenHandler = null)
         {
-            IList<TSqlStatement> statements = GetStatements(statementList).ToArray();
+            IList<TSqlStatement> statements = statementList.Statements;
             for (int i = 0; i < statements.Count; i++)
             {
                 TSqlStatement statement = statements[i];
@@ -58,9 +52,5 @@ protected void CollectStatements(StatementList statementList, Action<TSqlStateme
                 statementHandler(statement, i, statements.Count);
             }
         }
-
-        private static IEnumerable<TSqlStatement> GetStatements(StatementList statementList) => statementList.Statements.Where(FilterStatement);
-
-        private static bool FilterStatement(TSqlStatement statement) => !ExcludedTypes.Any(statement.GetType().IsAssignableFrom);
     }
 }

src/Dibix.Sdk/CodeGeneration/Model/CodeGenerationModelLoader.cs

@@ -72,7 +72,7 @@ string projectName
             bool requireExplicitMarkup = !isEmbedded;
             ISqlStatementParser parser = new SqlStoredProcedureParser(requireExplicitMarkup);
             Lazy<TSqlModel> modelAccessor = sqlModel != null ? new Lazy<TSqlModel>(() => sqlModel) : new Lazy<TSqlModel>(() => PublicSqlDataSchemaModelLoader.Load(projectName, databaseSchemaProviderName, modelCollation, source, sqlReferencePath, logger));
-            ISqlStatementFormatter formatter = isEmbedded ? (ISqlStatementFormatter)new TakeSourceSqlStatementFormatter() : new ExecStoredProcedureSqlStatementFormatter();
+            ISqlStatementFormatter formatter = SelectSqlStatementFormatter(isEmbedded);
             formatter.StripWhiteSpace = model.CommandTextFormatting == CommandTextFormatting.StripWhiteSpace;
             IDictionary<string, SecurityScheme> securitySchemeMap = new Dictionary<string, SecurityScheme>();
 
@@ -99,5 +99,13 @@ string projectName
 
             return model;
         }
+
+        private static ISqlStatementFormatter SelectSqlStatementFormatter(bool isEmbedded)
+        {
+            if (isEmbedded)
+                return new TakeSourceSqlStatementFormatter();
+            
+            return new ExecStoredProcedureSqlStatementFormatter();
+        }
     }
 }