Replace some hardcoded validation exceptions with optional configuration properties

Author: C0nquistadore

src/Dibix.Sdk.Cli/CodeGenerationTaskRunner.cs

@@ -30,6 +30,8 @@ protected override void Execute(InputConfiguration configuration)
               , references: configuration.GetItems("References")
               , defaultSecuritySchemes: configuration.GetItems("DefaultSecuritySchemes")
               , isEmbedded: configuration.GetSingleValue<bool>("IsEmbedded")
+              , limitDdlStatements: configuration.GetSingleValue<bool>("LimitDdlStatements")
+              , preventDmlReferences: configuration.GetSingleValue<bool>("PreventDmlReferences")
               , enableExperimentalFeatures: configuration.GetSingleValue<bool>("EnableExperimentalFeatures")
               , databaseSchemaProviderName: configuration.GetSingleValue<string>("DatabaseSchemaProviderName")
               , modelCollation: configuration.GetSingleValue<string>("ModelCollation")

src/Dibix.Sdk.Cli/SqlCodeAnalysisTaskRunner.cs

@@ -29,14 +29,15 @@ TSqlModel model
           , string projectName
           , SqlCodeAnalysisConfiguration configuration
           , bool isEmbedded
+          , bool limitDdlStatements
           , ISqlCodeAnalysisSuppressionService suppressionService
           , ILogger logger
         )
         {
             this._source = source;
             this._suppressionService = suppressionService;
             this._logger = logger;
-            this.Model = new SqlModel(source, fragment, isScriptArtifact, projectName, isEmbedded, model, logger);
+            this.Model = new SqlModel(source, fragment, isScriptArtifact, projectName, isEmbedded, limitDdlStatements, model, logger);
             this._hash = CalculateHash(source);
             this.Fragment = fragment;
             this.Configuration = configuration;

src/Dibix.Sdk.Cli/SqlCoreTaskRunner.cs

@@ -17,28 +17,30 @@ public sealed class SqlCodeAnalysisRuleEngine : ISqlCodeAnalysisRuleEngine, ISql
         private readonly string _projectName;
         private readonly SqlCodeAnalysisConfiguration _configuration;
         private readonly bool _isEmbedded;
+        private readonly bool _limitDdlStatements;
         private readonly LockEntryManager _lockEntryManager;
         private readonly ILogger _logger;
         private readonly ICollection<Func<SqlCodeAnalysisContext, IEnumerable<SqlCodeAnalysisError>>> _rules;
         #endregion
 
         #region Constructor
-        private SqlCodeAnalysisRuleEngine(TSqlModel model, string projectName, SqlCodeAnalysisConfiguration configuration, bool isEmbedded, LockEntryManager lockEntryManager, ILogger logger)
+        private SqlCodeAnalysisRuleEngine(TSqlModel model, string projectName, SqlCodeAnalysisConfiguration configuration, bool isEmbedded, bool limitDdlStatements, LockEntryManager lockEntryManager, ILogger logger)
         {
             this._model = model;
             this._projectName = projectName;
             this._configuration = configuration;
             this._isEmbedded = isEmbedded;
+            this._limitDdlStatements = limitDdlStatements;
             this._lockEntryManager = lockEntryManager;
             this._logger = logger;
             this._rules = ScanRules().ToArray();
         }
         #endregion
 
         #region Factory Methods
-        public static SqlCodeAnalysisRuleEngine Create(TSqlModel model, string projectName, SqlCodeAnalysisConfiguration configuration, bool isEmbedded, LockEntryManager lockEntryManager, ILogger logger)
+        public static SqlCodeAnalysisRuleEngine Create(TSqlModel model, string projectName, SqlCodeAnalysisConfiguration configuration, bool isEmbedded, bool limitDdlStatements, LockEntryManager lockEntryManager, ILogger logger)
         {
-            return new SqlCodeAnalysisRuleEngine(model, projectName, configuration, isEmbedded, lockEntryManager, logger);
+            return new SqlCodeAnalysisRuleEngine(model, projectName, configuration, isEmbedded, limitDdlStatements, lockEntryManager, logger);
         }
         #endregion
 
@@ -76,7 +78,7 @@ private IEnumerable<SqlCodeAnalysisError> Analyze(string source, TSqlFragment fr
 
         private SqlCodeAnalysisContext CreateContext(string source, TSqlFragment fragment, bool isScriptArtifact)
         {
-            return new SqlCodeAnalysisContext(this._model, source, fragment, isScriptArtifact, this._projectName, this._configuration, this._isEmbedded, this, this._logger);
+            return new SqlCodeAnalysisContext(this._model, source, fragment, isScriptArtifact, this._projectName, this._configuration, this._isEmbedded, this._limitDdlStatements, this, this._logger);
         }
 
         private static IEnumerable<Func<SqlCodeAnalysisContext, IEnumerable<SqlCodeAnalysisError>>> ScanRules()

src/Dibix.Sdk/CodeAnalysis/SqlCodeAnalysisContext.cs

@@ -11,44 +11,12 @@ namespace Dibix.Sdk.CodeAnalysis
 {
     public static class SqlCodeAnalysisTask
     {
-        public static bool Execute
-        (
-            string projectName
-          , string databaseSchemaProviderName
-          , string modelCollation
-          , string namingConventionPrefix
-          , bool isEmbedded
-          , string staticCodeAnalysisSucceededFile
-          , string resultsFile
-          , ICollection<TaskItem> source
-          , IEnumerable<TaskItem> scriptSource
-          , ICollection<TaskItem> sqlReferencePath
-          , ILogger logger
-        )
-        {
-            TSqlModel model = PublicSqlDataSchemaModelLoader.Load(projectName, databaseSchemaProviderName, modelCollation, source, sqlReferencePath, logger);
-            using (LockEntryManager lockEntryManager = LockEntryManager.Create())
-            {
-                return Execute
-                (
-                    projectName
-                  , new SqlCodeAnalysisConfiguration(namingConventionPrefix)
-                  , isEmbedded
-                  , staticCodeAnalysisSucceededFile
-                  , resultsFile
-                  , source
-                  , scriptSource
-                  , lockEntryManager
-                  , logger
-                  , model
-                );
-            }
-        }
         internal static bool Execute
         (
             string projectName
           , SqlCodeAnalysisConfiguration configuration
           , bool isEmbedded
+          , bool limitDdlStatements
           , string staticCodeAnalysisSucceededFile
           , string resultsFile
           , ICollection<TaskItem> source
@@ -63,7 +31,7 @@ string projectName
 
             ExecuteNativeCodeAnalysis(model, logger, staticCodeAnalysisSucceededFile, resultsFile);
 
-            ExecuteExtendedCodeAnalysis(projectName, configuration, isEmbedded, source, scriptSource, lockEntryManager, logger, model);
+            ExecuteExtendedCodeAnalysis(projectName, configuration, isEmbedded, limitDdlStatements, source, scriptSource, lockEntryManager, logger, model);
 
             return !logger.HasLoggedErrors;
         }
@@ -89,10 +57,10 @@ private static bool ExecuteNativeCodeAnalysis(TSqlModel model, ILogger logger, s
             return analysisResult != null;
         }
 
-        private static void ExecuteExtendedCodeAnalysis(string projectName, SqlCodeAnalysisConfiguration configuration, bool isEmbedded, ICollection<TaskItem> source, IEnumerable<TaskItem> scriptSource, LockEntryManager lockEntryManager, ILogger logger, TSqlModel model)
+        private static void ExecuteExtendedCodeAnalysis(string projectName, SqlCodeAnalysisConfiguration configuration, bool isEmbedded, bool limitDdlStatements, IEnumerable<TaskItem> source, IEnumerable<TaskItem> scriptSource, LockEntryManager lockEntryManager, ILogger logger, TSqlModel model)
         {
             logger.LogMessage("Performing extended code analysis...");
-            SqlCodeAnalysisRuleEngine codeAnalysisEngine = SqlCodeAnalysisRuleEngine.Create(model, projectName, configuration, isEmbedded, lockEntryManager, logger);
+            SqlCodeAnalysisRuleEngine codeAnalysisEngine = SqlCodeAnalysisRuleEngine.Create(model, projectName, configuration, isEmbedded, limitDdlStatements, lockEntryManager, logger);
 
             foreach (TaskItem inputFile in source)
             {

src/Dibix.Sdk/CodeAnalysis/SqlCodeAnalysisRuleEngine.cs

@@ -25,6 +25,8 @@ string projectName
           , IEnumerable<TaskItem> endpoints
           , IEnumerable<TaskItem> defaultSecuritySchemes
           , bool isEmbedded
+          , bool limitDdlStatements
+          , bool preventDmlReferences
           , bool enableExperimentalFeatures
           , string databaseSchemaProviderName
           , string modelCollation
@@ -71,7 +73,7 @@ string projectName
             // DDL statements however, need explicit markup, i.E. @Name at least
             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));
+            Lazy<TSqlModel> modelAccessor = sqlModel != null ? new Lazy<TSqlModel>(() => sqlModel) : new Lazy<TSqlModel>(() => PublicSqlDataSchemaModelLoader.Load(preventDmlReferences, databaseSchemaProviderName, modelCollation, source, sqlReferencePath, logger));
             ISqlStatementFormatter formatter = SelectSqlStatementFormatter(isEmbedded);
             formatter.StripWhiteSpace = model.CommandTextFormatting == CommandTextFormatting.StripWhiteSpace;
             IDictionary<string, SecurityScheme> securitySchemeMap = new Dictionary<string, SecurityScheme>();
@@ -85,7 +87,7 @@ string projectName
             typeResolver.Register(new ContractDefinitionSchemaTypeResolver(schemaRegistry, contractDefinitionProvider, externalSchemaResolver, assemblyResolver, assemblyResolver, logger, productName, areaName), 1);
             typeResolver.Register(new UserDefinedTypeSchemaTypeResolver(schemaRegistry, userDefinedTypeProvider, externalSchemaResolver, assemblyResolver, logger), 2);
 
-            ISqlStatementDefinitionProvider sqlStatementDefinitionProvider = new SqlStatementDefinitionProvider(projectName, isEmbedded, analyzeAlways: true, rootNamespace, productName, areaName, parser, formatter, typeResolver, schemaRegistry, schemaDefinitionResolver, logger, normalizedSources, modelAccessor);
+            ISqlStatementDefinitionProvider sqlStatementDefinitionProvider = new SqlStatementDefinitionProvider(projectName, isEmbedded, limitDdlStatements, analyzeAlways: true, rootNamespace, productName, areaName, parser, formatter, typeResolver, schemaRegistry, schemaDefinitionResolver, logger, normalizedSources, modelAccessor);
             IActionDefinitionResolverFacade actionResolver = new ActionDefinitionResolverFacade(productName, areaName, className, sqlStatementDefinitionProvider, externalSchemaResolver, assemblyResolver, lockEntryManager, schemaDefinitionResolver, schemaRegistry, logger);
             IControllerDefinitionProvider controllerDefinitionProvider = new ControllerDefinitionProvider(normalizedEndpoints, normalizedDefaultSecuritySchemes, securitySchemeMap, actionResolver, typeResolver, schemaDefinitionResolver, actionParameterSourceRegistry, actionParameterConverterRegistry, lockEntryManager, fileSystemProvider, logger);
 

src/Dibix.Sdk/CodeAnalysis/SqlCodeAnalysisTask.cs

@@ -10,6 +10,7 @@ internal sealed class SqlStatementDefinitionProvider : ISqlStatementDefinitionPr
         #region Fields
         private readonly string _projectName;
         private readonly bool _isEmbedded;
+        private readonly bool _limitDdlStatements;
         private readonly bool _analyzeAlways;
         private readonly string _rootNamespace;
         private readonly string _productName;
@@ -34,6 +35,7 @@ public SqlStatementDefinitionProvider
         (
             string projectName
           , bool isEmbedded
+          , bool limitDdlStatements
           , bool analyzeAlways
           , string rootNamespace
           , string productName
@@ -50,6 +52,7 @@ string projectName
         {
             this._projectName = projectName;
             this._isEmbedded = isEmbedded;
+            this._limitDdlStatements = limitDdlStatements;
             this._analyzeAlways = analyzeAlways;
             this._rootNamespace = rootNamespace;
             this._productName = productName;
@@ -86,6 +89,7 @@ private void Collect(IEnumerable<string> files)
                       , modelAccessor: this._modelAccessor
                       , projectName: this._projectName
                       , isEmbedded: this._isEmbedded
+                      , limitDdlStatements: this._limitDdlStatements
                       , analyzeAlways: this._analyzeAlways
                       , rootNamspace: this._rootNamespace
                       , productName: this._productName

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

@@ -6,73 +6,6 @@ namespace Dibix.Sdk.CodeGeneration
 {
     public static class CodeGenerationTask
     {
-        public static bool Execute
-        (
-            string projectName
-          , string projectDirectory
-          , string productName
-          , string areaName
-          , string title
-          , string version
-          , string description
-          , string baseUrl
-          , string outputDirectory
-          , string defaultOutputName
-          , string clientOutputName
-          , string externalAssemblyReferenceDirectory
-          , ICollection<TaskItem> source
-          , IEnumerable<TaskItem> contracts
-          , IEnumerable<TaskItem> endpoints
-          , IEnumerable<TaskItem> references
-          , IEnumerable<TaskItem> defaultSecuritySchemes
-          , bool isEmbedded
-          , bool enableExperimentalFeatures
-          , string databaseSchemaProviderName
-          , string modelCollation
-          , ICollection<TaskItem> sqlReferencePath
-          , ILogger logger
-          , out string[] additionalAssemblyReferences
-        )
-        {
-            IActionParameterSourceRegistry actionParameterSourceRegistry = new ActionParameterSourceRegistry();
-            IActionParameterConverterRegistry actionParameterConverterRegistry = new ActionParameterConverterRegistry();
-            IFileSystemProvider fileSystemProvider = new PhysicalFileSystemProvider(projectDirectory);
-            using (LockEntryManager lockEntryManager = LockEntryManager.Create())
-            {
-                return Execute
-                (
-                    projectName
-                  , projectDirectory
-                  , productName
-                  , areaName
-                  , title
-                  , version
-                  , description
-                  , new EndpointConfiguration(baseUrl)
-                  , outputDirectory
-                  , defaultOutputName
-                  , clientOutputName
-                  , externalAssemblyReferenceDirectory
-                  , source
-                  , contracts
-                  , endpoints
-                  , references
-                  , defaultSecuritySchemes
-                  , isEmbedded
-                  , enableExperimentalFeatures
-                  , databaseSchemaProviderName
-                  , modelCollation
-                  , sqlReferencePath
-                  , actionParameterSourceRegistry
-                  , actionParameterConverterRegistry
-                  , lockEntryManager
-                  , fileSystemProvider
-                  , logger
-                  , sqlModel: null
-                  , out additionalAssemblyReferences
-                );
-            }
-        }
         internal static bool Execute
         (
             string projectName
@@ -93,6 +26,8 @@ string projectName
           , IEnumerable<TaskItem> references
           , IEnumerable<TaskItem> defaultSecuritySchemes
           , bool isEmbedded
+          , bool limitDdlStatements
+          , bool preventDmlReferences
           , bool enableExperimentalFeatures
           , string databaseSchemaProviderName
           , string modelCollation
@@ -127,6 +62,8 @@ string projectName
               , contracts
               , endpoints, defaultSecuritySchemes
               , isEmbedded
+              , limitDdlStatements
+              , preventDmlReferences
               , enableExperimentalFeatures
               , databaseSchemaProviderName
               , modelCollation