Always provide commandType, parameters when generating dao accessor to avoid missing overloads

Author: C0nquistadore

src/Dibix.Sdk.VisualStudio/Configuration/DacPacSourceConfiguration.cs

@@ -23,7 +23,7 @@ public DacPacSourceConfiguration(IFileSystemProvider fileSystemProvider, string
         #endregion
 
         #region Overrides
-        protected override IEnumerable<SqlStatementInfo> CollectStatements(ISqlStatementParser parser, ISqlStatementFormatter formatter, ITypeResolverFacade typeResolver, ISchemaRegistry schemaRegistry, ILogger logger)
+        protected override IEnumerable<SqlStatementDescriptor> CollectStatements(ISqlStatementParser parser, ISqlStatementFormatter formatter, ITypeResolverFacade typeResolver, ISchemaRegistry schemaRegistry, ILogger logger)
         {
             SqlStatementCollector statementCollector = new DacPacSqlStatementCollector
             (

src/Dibix.Sdk.VisualStudio/Configuration/InputSourceConfiguration.cs

@@ -24,13 +24,13 @@ public void Collect(CodeGenerationModel model, ITypeResolverFacade typeResolver,
             ISqlStatementParser parser = (ISqlStatementParser)Activator.CreateInstance(this.Parser);
             ISqlStatementFormatter formatter = (ISqlStatementFormatter)Activator.CreateInstance(this.Formatter);
             formatter.StripWhiteSpace = model.CommandTextFormatting == CommandTextFormatting.StripWhiteSpace;
-            foreach (SqlStatementInfo info in this.CollectStatements(parser, formatter, typeResolver, schemaRegistry, logger).Where(x => x != null)) 
+            foreach (SqlStatementDescriptor info in this.CollectStatements(parser, formatter, typeResolver, schemaRegistry, logger).Where(x => x != null)) 
                 model.Statements.Add(info);
         }
         #endregion
 
         #region Protected Methods
-        protected abstract IEnumerable<SqlStatementInfo> CollectStatements(ISqlStatementParser parser, ISqlStatementFormatter formatter, ITypeResolverFacade typeResolver, ISchemaRegistry schemaRegistry, ILogger logger);
+        protected abstract IEnumerable<SqlStatementDescriptor> CollectStatements(ISqlStatementParser parser, ISqlStatementFormatter formatter, ITypeResolverFacade typeResolver, ISchemaRegistry schemaRegistry, ILogger logger);
         #endregion
     }
 }

src/Dibix.Sdk.VisualStudio/Configuration/PhysicalSourceConfiguration.cs

@@ -34,7 +34,7 @@ public PhysicalSourceConfiguration(IFileSystemProvider fileSystemProvider, strin
         #endregion
 
         #region Overrides
-        protected override IEnumerable<SqlStatementInfo> CollectStatements(ISqlStatementParser parser, ISqlStatementFormatter formatter, ITypeResolverFacade typeResolver, ISchemaRegistry schemaRegistry, ILogger logger)
+        protected override IEnumerable<SqlStatementDescriptor> CollectStatements(ISqlStatementParser parser, ISqlStatementFormatter formatter, ITypeResolverFacade typeResolver, ISchemaRegistry schemaRegistry, ILogger logger)
         {
             IEnumerable<string> files = this._fileSystemProvider
                                             .GetFiles(this._projectName, this._include, this._exclude)

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

@@ -5,10 +5,6 @@ namespace Dibix.Sdk.CodeGeneration
 {
     public sealed class ExecStoredProcedureSqlStatementFormatter : SqlStatementFormatter, ISqlStatementFormatter
     {
-        protected override string Format(SqlStatementInfo info, StatementList statementList)
-        {
-            info.CommandType = CommandType.StoredProcedure;
-            return info.ProcedureName;
-        }
+        protected override FormattedSqlStatement Format(SqlStatementDescriptor statementDescriptor, StatementList statementList) => new FormattedSqlStatement(statementDescriptor.ProcedureName, CommandType.StoredProcedure);
     }
 }

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

@@ -0,0 +1,16 @@
+using System.Data;
+
+namespace Dibix.Sdk.CodeGeneration
+{
+    public sealed class FormattedSqlStatement
+    {
+        public string Content { get; set; }
+        public CommandType CommandType { get; }
+
+        public FormattedSqlStatement(string content, CommandType commandType)
+        {
+            this.Content = content;
+            this.CommandType = commandType;
+        }
+    }
+}

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

@@ -1,11 +1,12 @@
-using Dibix.Sdk.Sql;
+using System.Data;
+using Dibix.Sdk.Sql;
 using Microsoft.SqlServer.TransactSql.ScriptDom;
 
 namespace Dibix.Sdk.CodeGeneration
 {
     public sealed class GenerateScriptSqlStatementFormatter : SqlStatementFormatter, ISqlStatementFormatter
     {
-        protected override string Format(SqlStatementInfo info, StatementList statementList)
+        protected override FormattedSqlStatement Format(SqlStatementDescriptor statementDescriptor, StatementList statementList)
         {
             TSqlBatch batch = new TSqlBatch();
 
@@ -14,7 +15,7 @@ protected override string Format(SqlStatementInfo info, StatementList statementL
             base.CollectStatements(statementList, StatementHandler);
 
             string generated = ScriptDomFacade.Generate(batch, x => x.Options.AlignClauseBodies = false);
-            return generated;
+            return new FormattedSqlStatement(generated, CommandType.Text);
         }
     }
 }

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

@@ -6,6 +6,6 @@ public interface ISqlStatementFormatter
     {
         bool StripWhiteSpace { get; set; }
 
-        string Format(SqlStatementInfo info, StatementList statementList);
+        FormattedSqlStatement Format(SqlStatementDescriptor statementDescriptor, StatementList statementList);
     }
 }

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

@@ -17,9 +17,14 @@ public abstract class SqlStatementFormatter : ISqlStatementFormatter
 
         public bool StripWhiteSpace { get; set; }
 
-        string ISqlStatementFormatter.Format(SqlStatementInfo info, StatementList statementList) => this.Format(info, statementList)?.Trim();
+        FormattedSqlStatement ISqlStatementFormatter.Format(SqlStatementDescriptor statementDescriptor, StatementList statementList)
+        {
+            FormattedSqlStatement statement = this.Format(statementDescriptor, statementList);
+            statement.Content = statement.Content.Trim();
+            return statement;
+        }
 
-        protected abstract string Format(SqlStatementInfo info, StatementList statementList);
+        protected abstract FormattedSqlStatement Format(SqlStatementDescriptor statementDescriptor, StatementList statementList);
 
         protected void CollectStatements(StatementList statementList, Action<TSqlStatement, int, int> statementHandler, Action<TSqlParserToken> tokenHandler = null)
         {

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

@@ -1,4 +1,5 @@
 using System;
+using System.Data;
 using System.Linq;
 using System.Text;
 using Dibix.Sdk.Sql;
@@ -8,7 +9,7 @@ namespace Dibix.Sdk.CodeGeneration
 {
     public sealed class TakeSourceSqlStatementFormatter : SqlStatementFormatter, ISqlStatementFormatter
     {
-        protected override string Format(SqlStatementInfo info, StatementList statementList)
+        protected override FormattedSqlStatement Format(SqlStatementDescriptor statementDescriptor, StatementList statementList)
         {
             StringBuilder sb = new StringBuilder();
 
@@ -34,7 +35,8 @@ void TokenHandler(TSqlParserToken token)
 
             base.CollectStatements(statementList, StatementHandler, TokenHandler);
 
-            return DecreaseIndentation(sb.ToString());
+            string content = DecreaseIndentation(sb.ToString());
+            return new FormattedSqlStatement(content, CommandType.Text);
         }
 
         private static string DecreaseIndentation(string text) => String.Join("\n", text.Split('\n').Select((line, lineIndex) =>

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

@@ -11,7 +11,7 @@ public class CodeGenerationModel
         public string BaseUrl { get; set; }
         public CodeGeneratorCompatibilityLevel CompatibilityLevel { get; }
         public CommandTextFormatting CommandTextFormatting { get; set; }
-        public IList<SqlStatementInfo> Statements { get; }
+        public IList<SqlStatementDescriptor> Statements { get; }
         public IList<UserDefinedTypeSchema> UserDefinedTypes { get; }
         public ICollection<SchemaDefinition> Contracts { get; }
         public IList<ControllerDefinition> Controllers { get; }
@@ -21,7 +21,7 @@ public class CodeGenerationModel
         public CodeGenerationModel(CodeGeneratorCompatibilityLevel compatibilityLevel)
         {
             this.CompatibilityLevel = compatibilityLevel;
-            this.Statements = new Collection<SqlStatementInfo>();
+            this.Statements = new Collection<SqlStatementDescriptor>();
             this.UserDefinedTypes = new Collection<UserDefinedTypeSchema>();
             this.Contracts = new Collection<SchemaDefinition>();
             this.Controllers = new Collection<ControllerDefinition>();