Merge pull request #27 from data-solution-automation-engine/dev/sj/floss-v2-take1

floss clean up

Author: RoelantVos

.gitattributes

@@ -17,7 +17,7 @@
 #
 # Merging from the command prompt will add diff markers to the files if there
 # are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following 
+# the diff markers are never inserted). Diff markers may cause the following
 # file extensions to fail to load in VS. An alternative would be to treat
 # these files as binary and thus will always conflict and require user
 # intervention with every merge. To do so, just uncomment the entries below
@@ -46,9 +46,9 @@
 
 ###############################################################################
 # diff behavior for common document formats
-# 
+#
 # Convert binary document formats to text before diffing them. This feature
-# is only available from the command line. Turn it on by uncommenting the 
+# is only available from the command line. Turn it on by uncommenting the
 # entries below.
 ###############################################################################
 #*.doc   diff=astextplain

.gitignore

@@ -397,10 +397,14 @@ FodyWeavers.xsd
 # JetBrains Rider
 *.sln.iml
 
-# Specifically include the reference dacpacs in the repo, so they can be directly referenced in project without requiring a separate build
-
-!020_DIRECT_Framework/Reference_Databases/[Bb]in
-!020_DIRECT_Framework/Reference_Databases/[Bb]in/[Dd]ebug/
-020_DIRECT_Framework/Reference_Databases/[Bb]in/[Dd]ebug/*
-!020_DIRECT_Framework/Reference_Databases/bin/Debug/master.dacpac
-!020_DIRECT_Framework/Reference_Databases/bin/Debug/msdb.dacpac
+# DIRECT OPTION - Specifically include only the reference dacpacs in the repo,
+# so they can be directly referenced in project without requiring a separate build
+# The build process has a preprocess step that builds the references,
+# so including these are optional depending on the development and deploymetn workflow used
+# Also consider the build configuration used, the following is for a Debug build
+
+# !Direct_Framework/Reference_Databases/[Bb]in
+# !Direct_Framework/Reference_Databases/[Bb]in/[Dd]ebug/
+# Direct_Framework/Reference_Databases/[Bb]in/[Dd]ebug/*
+# !Direct_Framework/Reference_Databases/bin/Debug/master.dacpac
+# !Direct_Framework/Reference_Databases/bin/Debug/msdb.dacpac

Direct_Framework/BuildTools/PreBuild.cmd

@@ -3,8 +3,5 @@
 rem Debug cmd for post-build event
 ECHO *** CMD - Pre-Build Event: Building 'Direct_Framework' project...
 
-REM ECHO current directory: %CD%
-REM ECHO script directory: %~dp0
-
 rem Run the pre-build PowerShell script
 pwsh -ExecutionPolicy Bypass -NoProfile -NonInteractive -File %~dp0\PreBuild.ps1 -path %~dp0

Documentation/Installation.md

@@ -2,4 +2,4 @@
 
 The DIRECT framework can be deployed from the Visual Studio solution/project, using the publish function. Alternatively, the project can be compiled to a DACPAC and deployed via command-line tools such as sqlcmd.
 
-As part of the installation, post deployment scripts are run to provide the standard framework contents. Pre- and post DACPAC deploment placeholders are also available.
+As part of the installation, post deployment scripts are run to provide the standard framework contents. Pre- and post DACPAC deployment placeholders are also available.

Documentation/Model.md

@@ -1,6 +1,8 @@
 # Direct Framework Physical Model
 
-This section contains the DIRECT physical model in MermaidChart format. The contents below can be rendered or pasted in the online editor (https://www.mermaidchart.com/).
+This section contains the DIRECT physical model in Mermaid erDiagram format.
+
+The contents below can be rendered through mermaid [https://mermaid.js.org/](https://mermaid.js.org/) and [https://github.com/mermaid-js/mermaid](https://github.com/mermaid-js/mermaid), using any supported method, or pasted in an online editor such as [https://www.mermaidchart.com](https://www.mermaidchart.com).
 
 ```mermaid
 ---
@@ -31,7 +33,7 @@ erDiagram
     BATCH_INSTANCE {
         BATCH_INSTANCE_ID           BIGINT PK
         BATCH_ID                    INT FK
-        PARENT_BATCH_INSTANCE_ID    BIGINT        
+        PARENT_BATCH_INSTANCE_ID    BIGINT
         START_TIMESTAMP             DATETIME2
         END_TIMESTAMP               DATETIME2
         INTERNAL_PROCESSING_CODE    NVARCHAR(100) FK
@@ -170,7 +172,7 @@ erDiagram
         EVENT_TYPE_CODE_DESCRIPTION     NVARCHAR(4000)
     }
 
-    EVENT_TYPE ||..|{ EVENT_LOG : states    
+    EVENT_TYPE ||..|{ EVENT_LOG : states
 
     EXECUTION_STATUS {
         EXECUTION_STATUS_CODE NVARCHAR(100) PK
@@ -186,7 +188,7 @@ erDiagram
         GROUP NVARCHAR(100) 
         DESCRIPTION NVARCHAR(4000)
         ACTIVE_INDICATOR CHAR(1)
-    }        
+    }
 
     FREQUENCY {
         FREQUENCY_CODE NVARCHAR(100) PK

Example_Scripts/Maintenance/DIRECT_Non_Execution_Exception_Check.sql

@@ -1,5 +1,5 @@
 --Show which modules haven't run in the last 3 days
-SELECT 
+SELECT
 	module.MODULE_CODE,
 	module.MODULE_ID,
 	main.MODULE_INSTANCE_ID AS MOST_RECENT_MODULE_INSTANCE_ID,

Example_Scripts/Maintenance/DIRECT_Recent_Executions.sql

@@ -1,4 +1,4 @@
-SELECT 
+SELECT
 MODULE_CODE,
 modinst.EXECUTION_STATUS_CODE,
 modinst.MODULE_INSTANCE_ID,

Example_Scripts/Maintenance/DIRECT_Runtime_Exception_Check.sql

@@ -24,7 +24,7 @@ ORDER BY 3 DESC
 -- Exception check Module level
 SELECT
     module.MODULE_CODE,
-	main.BATCH_INSTANCE_ID,
+    main.BATCH_INSTANCE_ID,
     main.MODULE_INSTANCE_ID AS MOST_RECENT_MODULE_INSTANCE_ID,
     main.START_DATETIME,
     main.END_DATETIME,

Example_Scripts/Maintenance/Generic_Table_Row_Count.sql

@@ -10,6 +10,6 @@
 		on t.object_id = p.object_id
 	inner join sys.allocation_units a on p.partition_id = a.container_id
 group by t.name
-order by 
+order by
 CAST(FORMAT(SUM(round(8 * a.total_pages/1024.0,2)),'####') AS INT)
 DESC

Reference_Databases/readme.md

@@ -19,7 +19,9 @@ This allows it to pull the required reference Dacpac files from nuget without ha
 
 This project format also allows building the project using dotnet, removing a dependency on other, less readily available toolings, which can be helpful when building in containers, or through pipelines with limited tool support.
 
-Version and references are kept at SQL Server 2019/150
+Version and references in the project are currently Azure SQL database, which is only using the master reference.
+
+Add/remove references as needed, and set the version to the expected target. The below example uses version 150 instead (SQL Server 2019)
 
 ## Creating a project