Merge pull request #14 from RoelantVos/bug-fixes-and-improved-exception-handling

Bug fixes and improved exception handling

Author: RoelantVos

.gitignore

@@ -242,11 +242,4 @@ ModelManifest.xml
 .fake/
 
 .vscode
-020_DIRECT_Framework/Direct_Framework/Direct_Framework.jfm
-*.jfm
-*.jfm
-*.jfm
-020_DIRECT_Framework/Direct_Framework/Direct_Framework.jfm
-*.jfm
-*.jfm
-020_DIRECT_Framework/Direct_Framework/Direct_Framework.jfm
+*.jfm

020_DIRECT_Framework/Direct_Framework/Direct_Framework.jfm

@@ -8,7 +8,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectVersion>4.1</ProjectVersion>
     <ProjectGuid>{b88ff268-22f9-4416-9e36-cfe598d243eb}</ProjectGuid>
-    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider</DSP>
+    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider</DSP>
     <OutputType>Database</OutputType>
     <RootPath>
     </RootPath>
@@ -67,12 +67,12 @@
     <Folder Include="Tables" />
     <Folder Include="Views" />
     <Folder Include="Schemas" />
+    <Folder Include="Reference_Databases" />
   </ItemGroup>
   <ItemGroup>
-    <Build Include="Functions\omd.GetConsistencyDateTime.sql" />
     <Build Include="Functions\omd.GetDependency.sql" />
-    <Build Include="Functions\omd.GetLoadWindowDateTimes.sql" />
-    <Build Include="Functions\omd.GetLoadWindowModuleInstance.sql" />
+    <Build Include="Functions\omd.GetModuleLoadWindowDateTime.sql" />
+    <Build Include="Functions\omd.GetModuleLoadWindowIdentifier.sql" />
     <None Include="Scripts\InsertReferenceData.sql" />
     <Build Include="Tables\omd.AREA.sql" />
     <Build Include="Tables\omd.BATCH.sql" />
@@ -101,11 +101,11 @@
     <Build Include="Schemas\omd.sql" />
     <Build Include="Schemas\omd_processing.sql" />
     <Build Include="Schemas\omd_reporting.sql" />
-    <None Include="Views\omd_processing.vw_CURRENT_PROCESSING.sql" />
+    <Build Include="Views\omd_processing.vw_CURRENT_PROCESSING.sql" />
     <None Include="Views\omd_reporting.vw_QUEUE_PROGRESS.sql" />
     <None Include="Views\omd_reporting.vw_CURRENT_PROCESSING.sql" />
     <Build Include="Functions\omd.CalculateChangeKey.sql" />
-    <None Include="Functions\omd_processing.NextModuleInQueue.sql" />
+    <Build Include="Functions\omd_processing.NextModuleInQueue.sql" />
     <Build Include="Functions\omd_processing.GetDependentTables.sql" />
     <Build Include="Views\omd_reporting.vw_CUMULATIVE_LOAD_TIME.sql" />
     <Build Include="Views\omd_reporting.vw_EXCEPTIONS_BATCH.sql" />
@@ -118,12 +118,12 @@
     <Build Include="Views\omd_reporting.vw_EXCEPTIONS_NON_RUNNING_MODULES.sql" />
     <Build Include="Views\omd_reporting.vw_EXCEPTIONS_TABLE_CONSISTENCY.sql" />
     <Build Include="Stored Procedures\omd.TableCondensing.sql" />
-    <None Include="Views\omd_processing.vw_QUEUE_BATCH_PROCESSING.sql">
+    <Build Include="Views\omd_processing.vw_QUEUE_BATCH_PROCESSING.sql">
       <QuotedIdentifier>Off</QuotedIdentifier>
-    </None>
-    <None Include="Views\omd_processing.vw_QUEUE_MODULE_PROCESSING.sql">
+    </Build>
+    <Build Include="Views\omd_processing.vw_QUEUE_MODULE_PROCESSING.sql">
       <QuotedIdentifier>Off</QuotedIdentifier>
-    </None>
+    </Build>
     <Build Include="Stored Procedures\omd.CreateModuleInstance.sql" />
     <Build Include="Stored Procedures\omd.ModuleEvaluation.sql" />
     <Build Include="Stored Procedures\omd.RunModule.sql" />
@@ -142,8 +142,9 @@
     <Build Include="Functions\omd.GetFailedBatchIdList.sql" />
     <Build Include="Functions\omd.GetPreviousBatchInstanceDetails.sql" />
     <Build Include="Stored Procedures\omd.CreateLoadWindow.sql" />
-    <Build Include="Functions\GetModuleAreaByModuleId.sql" />
+    <Build Include="Functions\omd.GetModuleAreaByModuleId.sql" />
     <Build Include="Stored Procedures\omd.InsertIntoEventLog.sql" />
+    <Build Include="Stored Procedures\omd.GetConsistencyDateTime.sql" />
   </ItemGroup>
   <ItemGroup>
     <PostDeploy Include="Scripts\Script.PostDeployment.sql" />
@@ -152,16 +153,21 @@
     <None Include="Build\Direct_Framework.publish.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ArtifactReference Include="$(DacPacRootPath)\Extensions\Microsoft\SQLDB\Extensions\SqlServer\130\SqlSchemas\master.dacpac">
-      <HintPath>$(DacPacRootPath)\Extensions\Microsoft\SQLDB\Extensions\SqlServer\130\SqlSchemas\master.dacpac</HintPath>
+    <ArtifactReference Include="Reference_Databases\SSISDB.dacpac">
+      <HintPath>Reference_Databases\SSISDB.dacpac</HintPath>
+      <SuppressMissingDependenciesErrors>False</SuppressMissingDependenciesErrors>
+      <DatabaseSqlCmdVariable>SSISDB</DatabaseSqlCmdVariable>
+    </ArtifactReference>
+    <ArtifactReference Include="C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\Extensions\Microsoft\SQLDB\Extensions\SqlServer\150\SqlSchemas\master.dacpac">
+      <HintPath>C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\Extensions\Microsoft\SQLDB\Extensions\SqlServer\150\SqlSchemas\master.dacpac</HintPath>
       <SuppressMissingDependenciesErrors>False</SuppressMissingDependenciesErrors>
       <DatabaseVariableLiteralValue>master</DatabaseVariableLiteralValue>
     </ArtifactReference>
   </ItemGroup>
   <ItemGroup>
     <SqlCmdVariable Include="SSISDB">
       <DefaultValue>SSISDB</DefaultValue>
-      <Value>$(SqlCmdVar__3)</Value>
+      <Value>$(SqlCmdVar__1)</Value>
     </SqlCmdVariable>
   </ItemGroup>
 </Project>

020_DIRECT_Framework/Direct_Framework/Direct_Framework.sqlproj

@@ -1,11 +1,9 @@
-
-
-CREATE FUNCTION [omd].[GetBatchModuleActiveIndicatorValue]
+CREATE FUNCTION [omd].[GetBatchModuleActiveIndicatorValue]
 (
-	@ModuleId INT,
-	@BatchId INT
+	@BatchId INT,
+	@ModuleId INT
 )
-RETURNS VARCHAR(1) AS
+RETURNS VARCHAR(3) AS
 
 -- =============================================
 -- Function: Get the Batch/Module active/inactive flag.
@@ -15,7 +13,7 @@ RETURNS VARCHAR(1) AS
 BEGIN
 	-- Declare ouput variable
 
-	DECLARE @InactiveIndicator VARCHAR(1)
+	DECLARE @InactiveIndicator VARCHAR(3)
 
 	SET @InactiveIndicator = 
 	(
@@ -28,7 +26,7 @@ BEGIN
         WHERE BATCH_ID = @BatchId AND MODULE_ID = @ModuleId
       	UNION
       	-- Return if there is nothing, to give at least a result row for further processing
-        SELECT null
+        SELECT 'N/A'
       ) sub
 	)
 

020_DIRECT_Framework/Direct_Framework/Functions/omd.GetBatchModuleActiveIndicatorValue.sql

@@ -19,8 +19,6 @@ BEGIN
 	  WHERE MODULE_CODE = @ModuleCode
 	)
 
-	SET @ModuleId = COALESCE(@ModuleId,0)
-
 	-- Return the result of the function
 	RETURN @ModuleId
 END

020_DIRECT_Framework/Direct_Framework/Functions/omd.GetConsistencyDateTime.sql

@@ -1,4 +1,4 @@
-CREATE FUNCTION [omd].[GetLoadWindowDateTimes] ( @ModuleId INT, @start_or_end tinyint)
+CREATE FUNCTION [omd].[GetModuleLoadWindowDateTime] ( @ModuleId INT, @start_or_end tinyint)
 RETURNS DATETIME2(7) AS 
 BEGIN 
        DECLARE @result DATETIME2(7)

020_DIRECT_Framework/Direct_Framework/Functions/GetModuleAreaByModuleId.sql renamed to 020_DIRECT_Framework/Direct_Framework/Functions/omd.GetModuleAreaByModuleId.sql

@@ -1,4 +1,4 @@
-CREATE FUNCTION [omd].[GetLoadWindowModuleInstance] ( @module_code VARCHAR(255), @start_or_end tinyint)
+CREATE FUNCTION [omd].[GetModuleLoadWindowIdentifier] (@ModuleId INT, @start_or_end tinyint)
 RETURNS BIGINT AS 
 BEGIN 
        DECLARE @result BIGINT
@@ -15,7 +15,7 @@ BEGIN
                  ROW_NUMBER() OVER (PARTITION BY MODULE_ID ORDER BY INSERT_DATETIME DESC) AS ROW_NR 
               FROM omd.SOURCE_CONTROL sct
               JOIN omd.MODULE_INSTANCE modinst ON sct.MODULE_INSTANCE_ID = modinst.MODULE_INSTANCE_ID
-              WHERE MODULE_ID = (SELECT MODULE_ID FROM omd.MODULE module WHERE module.MODULE_CODE=@module_code)
+              WHERE MODULE_ID = @ModuleId
               ) ranksub
               WHERE ROW_NR=1
        END
@@ -31,7 +31,7 @@ BEGIN
                    ROW_NUMBER() OVER (PARTITION BY modinst.MODULE_ID ORDER BY sct.INSERT_DATETIME DESC) AS ROW_NR 
                  FROM omd.SOURCE_CONTROL sct
                  JOIN omd.MODULE_INSTANCE modinst ON sct.MODULE_INSTANCE_ID = modinst.MODULE_INSTANCE_ID
-                 WHERE MODULE_ID=(SELECT MODULE_ID FROM omd.MODULE module WHERE module.MODULE_CODE = @module_code)
+                 WHERE MODULE_ID = @ModuleId
               ) ranksub
               WHERE ROW_NR=1
        END