Pattern updates for new handlebars

Roelant Vos · Roelant Vos · commit f02d94757b73 · 2022-01-10T13:09:56.000+10:00
diff --git a/Virtual_EDW/Form_Main.Designer.cs b/Virtual_EDW/Form_Main.Designer.cs
diff --git a/Virtual_EDW/Form_Main.cs b/Virtual_EDW/Form_Main.cs
@@ -34,11 +34,15 @@ public FormMain()
             InitializeComponent();
 
             // Set the version of the build for everything
-            const string versionNumberForApplication = "v1.6.5";
+            const string versionNumberForApplication = "v1.6.6";
 
             Text = $"Virtual Data Warehouse - {versionNumberForApplication}";
+            labelWelcome.Text = $"{labelWelcome.Text} - { versionNumberForApplication}";
+            ;
             VdwConfigurationSettings.VdwEventLog.Add(Event.CreateNewEvent(EventTypes.Information, $"{Text}."));
 
+
+
             #region Root Paths
             // Make sure the root directories exist, based on (tool) parameters
 
@@ -1625,5 +1629,10 @@ private void tabControlMain_SelectedIndexChanged(object sender, EventArgs e)
                 FormBase.VdwConfigurationSettings.SelectedMainTab = tabControlMain.SelectedTab.Name;
             }
         }
+
+        private void richTextBoxMainScreen_TextChanged(object sender, EventArgs e)
+        {
+
+        }
     }
 }
diff --git a/Virtual_EDW/LoadPatterns/loadPatternHubDeltaSelect.Handlebars b/Virtual_EDW/LoadPatterns/loadPatternHubDeltaSelect.Handlebars
@@ -28,7 +28,7 @@ FROM
             stg.[{{../metadataConfiguration.loadDateTimeAttribute}}],
             -1 AS [{{../metadataConfiguration.etlProcessAttribute}}],
             stg.[{{../metadataConfiguration.recordSourceAttribute}}]
-          FROM [{{sourceDataObjects.0.name}}] stg
+          FROM [{{sourceDataObjects.0.dataObjectConnection.extensions.1.value}}].[{{sourceDataObjects.0.name}}] stg
           WHERE NOT EXISTS
           (
              SELECT 1
diff --git a/Virtual_EDW/LoadPatterns/loadPatternHubView.Handlebars b/Virtual_EDW/LoadPatterns/loadPatternHubView.Handlebars
@@ -35,7 +35,7 @@ FROM
         CAST({{sourceDataItems.0.name}} AS NVARCHAR(100)) AS {{targetDataItem.name}},{{/each}}{{/each}}
         {{../metadataConfiguration.recordSourceAttribute}},
         MIN({{../metadataConfiguration.loadDateTimeAttribute}}) AS {{../metadataConfiguration.loadDateTimeAttribute}}
-    FROM [{{sourceDataObjects.0.name}}]
+    FROM [{{sourceDataObjects.0.dataObjectConnection.extensions.1.value}}].[{{sourceDataObjects.0.name}}]
     WHERE {{#each businessKeys}}{{#each businessKeyComponentMapping}}
         {{sourceDataItems.0.name}} IS NOT NULL{{#unless @last}} AND{{/unless}}{{/each}}{{/each}}
         {{#if filterCriterion}}AND {{filterCriterion}}{{/if}}
diff --git a/Virtual_EDW/LoadPatterns/loadPatternLinkSatelliteDrivingKeyView.Handlebars b/Virtual_EDW/LoadPatterns/loadPatternLinkSatelliteDrivingKeyView.Handlebars
@@ -58,7 +58,7 @@ FROM
         PARTITION BY {{#each ../../../../businessKeys}}{{#each BusinessKeyComponentMapping}}{{#each SourceDataItems}}{{#stringcompare dataItemClassification.0.classification "DrivingKey"}}{{name}}{{#unless @last}},{{/unless}}{{/stringcompare}}{{/each}}{{/each}}{{/each}}
         ORDER BY [{{../../../../../metadataConfiguration.loadDateTimeAttribute}}]
    ) AS PREVIOUS_FOLLOWER_KEY{{@index}}    {{/stringdiff}}{{/each}}{{/each}}{{/each}}
-  FROM {{sourceDataObjects.0.name}}
+  FROM [{{sourceDataObjects.0.dataObjectConnection.extensions.1.value}}].[{{sourceDataObjects.0.name}}]
   WHERE NOT
   ([{{../metadataConfiguration.sourceRowIdAttribute}}]>1 AND [{{../metadataConfiguration.changeDataCaptureAttribute}}] ='Delete')
   {{#if filterCriterion}}AND {{filterCriterion}} {{/if}}  
@@ -84,7 +84,7 @@ FROM
                 PARTITION BY {{#each businessKeys}}{{#each BusinessKeyComponentMapping}}{{#each SourceDataItems}}{{#stringcompare dataItemClassification.0.classification "DrivingKey"}}{{name}}{{#unless @last}},{{/unless}}{{/stringcompare}}{{/each}}{{/each}}{{/each}}
                 ORDER BY [{{../metadataConfiguration.loadDateTimeAttribute}}], {{#each businessKeys}}{{#each BusinessKeyComponentMapping}}{{#each SourceDataItems}}{{#stringcompare dataItemClassification.0.classification "DrivingKey"}}{{name}}{{#unless @last}},{{/unless}}{{/stringcompare}}{{/each}}{{/each}}{{/each}} ASC
            ) AS ROWVERSION
-        FROM {{sourceDataObjects.0.name}}
+        FROM [{{sourceDataObjects.0.dataObjectConnection.extensions.1.value}}].[{{sourceDataObjects.0.name}}]
    ) dummysub
 WHERE ROWVERSION=1
 ) sub
diff --git a/Virtual_EDW/LoadPatterns/loadPatternLinkSatelliteView.Handlebars b/Virtual_EDW/LoadPatterns/loadPatternLinkSatelliteView.Handlebars
@@ -105,7 +105,7 @@ FROM
            HASHBYTES('MD5',{{#each dataItemMappings}}
             ISNULL(RTRIM(CONVERT(NVARCHAR(100),{{sourceDataItems.0.name}})), 'N/A') + '#~!'{{#unless @last}} +{{/unless}}{{/each}}
            ) AS COMBINED_VALUE
-        FROM {{sourceDataObjects.0.name}}
+        FROM [{{sourceDataObjects.0.dataObjectConnection.extensions.1.value}}].[{{sourceDataObjects.0.name}}]
         {{#if filterCriterion}}WHERE {{filterCriterion}} {{/if}}
         UNION
         SELECT DISTINCT
@@ -119,7 +119,7 @@ FROM
           {{stringcompare targetDataItem.dataItemClassification.0.classification 'MultiActive'}}[{{sourceDataItems.0.name}}]{{else}}NULL{{/stringcompare}} AS [{{sourceDataItems.0.name}}],
           {{/each}}
           0x00000000000000000000000000000000 AS COMBINED_VALUE
-        FROM {{sourceDataObjects.0.name}}
+        FROM [{{sourceDataObjects.0.dataObjectConnection.extensions.1.value}}].[{{sourceDataObjects.0.name}}]
    ) sub
 ) combined_value
 WHERE 
diff --git a/Virtual_EDW/LoadPatterns/loadPatternLinkView.Handlebars b/Virtual_EDW/LoadPatterns/loadPatternLinkView.Handlebars
@@ -13,20 +13,20 @@ FROM
 ( {{#each dataObjectMappings}}{{#if @first}}
 SELECT
     HASHBYTES('MD5',  {{#each businessKeys}} {{#unless @first}}{{!-- Create the Surrogate Key using the combined Business Keys --}}{{#each dataItemMappings}}ISNULL(RTRIM(CONVERT(NVARCHAR(100), [{{targetDataItem.name}}], 'N/A') + '#~!'{{/each}}
-{{#each businessKeyComponentMapping}} ISNULL(RTRIM(CONVERT(NVARCHAR(100), {{targetDataItem.name}}{{../../@index}})), 'N/A') + '#~!'{{#unless @last}} +{{/unless}}{{/each}}{{#unless @last}} +{{/unless}}{{/unless}}{{/each}}
+{{#each businessKeyComponentMapping}} ISNULL(RTRIM(CONVERT(NVARCHAR(100), {{targetDataItem.name}}{{@../index }})), 'N/A') + '#~!'{{#unless @last}} +{{/unless}}{{/each}}{{#unless @last}} +{{/unless}}{{/unless}}{{/each}}
 {{#each dataItemMappings}} + ISNULL(RTRIM(CONVERT(NVARCHAR(100), [{{targetDataItem.name}}])), 'N/A') + '#~!'{{/each}}{{#each businessKeys}} {{#if @first}} ) AS {{surrogateKey}},{{/if}}{{/each}}
     -1 AS {{../metadataConfiguration.etlProcessAttribute}}, {{!-- List out the ETL Framework attributes --}}
     MIN({{../metadataConfiguration.loadDateTimeAttribute}}) AS {{../metadataConfiguration.loadDateTimeAttribute}},
     {{../metadataConfiguration.recordSourceAttribute}},{{#each businessKeys}}{{#unless @first}} {{!-- List out the separate (Hub) business keys, by skipping the first generic relationship key. --}}
     {{#unless businessKeyClassification}}HASHBYTES('MD5',
     {{#each businessKeyComponentMapping}}
-      ISNULL(RTRIM(CONVERT(NVARCHAR(100), {{targetDataItem.name}}{{../../@index}})), 'N/A') + '#~!'{{#unless @last}} +{{/unless}}{{/each}}
+      ISNULL(RTRIM(CONVERT(NVARCHAR(100), {{targetDataItem.name}}{{@../index }})), 'N/A') + '#~!'{{#unless @last}} +{{/unless}}{{/each}}
      ) AS {{surrogateKey}},
-    {{/unless}}{{#if businessKeyClassification}}{{#each businessKeyComponentMapping}}{{targetDataItem.name}}{{../../@index}}{{/each}} AS {{surrogateKey}},
+    {{/unless}}{{#if businessKeyClassification}}{{#each businessKeyComponentMapping}}{{targetDataItem.name}}{{@../index }}{{/each}} AS {{surrogateKey}},
     {{/if}} {{/unless}} {{/each}}{{#each dataItemMappings}}
     [{{targetDataItem.name}}],{{/each}}
     ROW_NUMBER() OVER (PARTITION BY {{#each businessKeys}} {{#unless @first}} {{#each businessKeyComponentMapping}} {{!-- Create a row number to enable selection only the earliest row, ordered by date/time --}}
-      {{targetDataItem.name}}{{../../@index}}{{#unless @last}},{{/unless}}{{/each}}{{#unless @last}},{{/unless}}{{/unless}} {{/each}}
+      {{targetDataItem.name}}{{@../index }}{{#unless @last}},{{/unless}}{{/each}}{{#unless @last}},{{/unless}}{{/unless}} {{/each}}
      {{#each dataItemMappings}},[{{targetDataItem.name}}]{{/each}}
     ORDER BY 
        MIN({{../metadataConfiguration.loadDateTimeAttribute}})
@@ -35,11 +35,11 @@ FROM
 ({{/if}}{{/each}}
     {{#each dataObjectMappings }}
     SELECT {{#each businessKeys}} {{#unless @first}} {{#each businessKeyComponentMapping}}
-        CAST({{sourceDataItems.0.name}} AS NVARCHAR(100)) AS {{targetDataItem.name}}{{../../@index}},{{/each}}{{/unless}}{{/each}}{{#each dataItemMappings}}
+        CAST({{sourceDataItems.0.name}} AS NVARCHAR(100)) AS {{targetDataItem.name}}{{@../index }},{{/each}}{{/unless}}{{/each}}{{#each dataItemMappings}}
         [{{sourceDataItems.0.name}}] AS [{{targetDataItem.name}}],{{/each}}
         {{../metadataConfiguration.recordSourceAttribute}},
         MIN({{../metadataConfiguration.loadDateTimeAttribute}}) AS {{../metadataConfiguration.loadDateTimeAttribute}}
-    FROM [{{sourceDataObjects.0.name}}]
+    FROM [{{sourceDataObjects.0.dataObjectConnection.extensions.1.value}}].[{{sourceDataObjects.0.name}}]
     WHERE {{#each businessKeys}} {{#unless @first}} {{#each businessKeyComponentMapping}}
        {{sourceDataItems.0.name}} IS NOT NULL{{#unless @last}} AND{{/unless}}{{/each}}{{#unless @last}} AND{{/unless}}{{/unless}} {{/each}}
        {{#each dataItemMappings}}
@@ -51,7 +51,7 @@ FROM
        {{../metadataConfiguration.recordSourceAttribute}}{{#unless @last}}UNION{{/unless}}
   ) LINK_selection
   GROUP BY {{#each businessKeys}} {{#unless @first}} {{#each businessKeyComponentMapping}}
-     {{targetDataItem.name}}{{../../@index}}{{#unless @last}},{{/unless}}{{/each}},{{/unless}}{{/each}}
+     {{targetDataItem.name}}{{@../index }}{{#unless @last}},{{/unless}}{{/each}},{{/unless}}{{/each}}
      {{#each dataItemMappings}}
      [{{targetDataItem.name}}],{{/each}}
      {{../metadataConfiguration.recordSourceAttribute}} {{/each}}
diff --git a/Virtual_EDW/LoadPatterns/loadPatternLinkViewNoHash.Handlebars b/Virtual_EDW/LoadPatterns/loadPatternLinkViewNoHash.Handlebars
@@ -13,20 +13,20 @@ FROM
 ( {{#each dataObjectMappings}}{{#if @first}}
 SELECT
     {{#each businessKeys}} {{#unless @first}}{{!-- Create the Surrogate Key using the combined Business Keys --}}{{#each dataItemMappings}}ISNULL(RTRIM(CONVERT(NVARCHAR(100), [{{targetDataItem.name}}], 'N/A') + '#~!'{{/each}}
-{{#each businessKeyComponentMapping}} ISNULL(RTRIM(CONVERT(NVARCHAR(100), {{targetDataItem.name}}{{../../@index}})), 'N/A') + '#~!'{{#unless @last}} +{{/unless}}{{/each}}{{#unless @last}} +{{/unless}}{{/unless}}{{/each}}
+{{#each businessKeyComponentMapping}} ISNULL(RTRIM(CONVERT(NVARCHAR(100), {{targetDataItem.name}}{{@../index }})), 'N/A') + '#~!'{{#unless @last}} +{{/unless}}{{/each}}{{#unless @last}} +{{/unless}}{{/unless}}{{/each}}
 {{#each dataItemMappings}} + ISNULL(RTRIM(CONVERT(NVARCHAR(100), [{{targetDataItem.name}}])), 'N/A') + '#~!'{{/each}}{{#each businessKeys}} {{#if @first}}AS {{surrogateKey}},{{/if}}{{/each}}
     -1 AS {{../metadataConfiguration.etlProcessAttribute}}, {{!-- List out the ETL Framework attributes --}}
     MIN({{../metadataConfiguration.loadDateTimeAttribute}}) AS {{../metadataConfiguration.loadDateTimeAttribute}},
     {{../metadataConfiguration.recordSourceAttribute}},{{#each businessKeys}}{{#unless @first}} {{!-- List out the separate (Hub) business keys, by skipping the first generic relationship key. --}}
     {{#unless businessKeyClassification}}
     {{#each businessKeyComponentMapping}}
-      ISNULL(RTRIM(CONVERT(NVARCHAR(100), {{targetDataItem.name}}{{../../@index}})), 'N/A') + '#~!'{{#unless @last}} +{{/unless}}{{/each}}
+      ISNULL(RTRIM(CONVERT(NVARCHAR(100), {{targetDataItem.name}}{{@../index }})), 'N/A') + '#~!'{{#unless @last}} +{{/unless}}{{/each}}
     AS {{surrogateKey}},
-    {{/unless}}{{#if businessKeyClassification}}{{#each businessKeyComponentMapping}}{{targetDataItem.name}}{{../../@index}}{{/each}} AS {{surrogateKey}},
+    {{/unless}}{{#if businessKeyClassification}}{{#each businessKeyComponentMapping}}{{targetDataItem.name}}{{@../index }}{{/each}} AS {{surrogateKey}},
     {{/if}} {{/unless}} {{/each}}{{#each dataItemMappings}}
     [{{targetDataItem.name}}],{{/each}}
     ROW_NUMBER() OVER (PARTITION BY {{#each businessKeys}} {{#unless @first}} {{#each businessKeyComponentMapping}} {{!-- Create a row number to enable selection only the earliest row, ordered by date/time --}}
-      {{targetDataItem.name}}{{../../@index}}{{#unless @last}},{{/unless}}{{/each}}{{#unless @last}},{{/unless}}{{/unless}} {{/each}}
+      {{targetDataItem.name}}{{@../index }}{{#unless @last}},{{/unless}}{{/each}}{{#unless @last}},{{/unless}}{{/unless}} {{/each}}
      {{#each dataItemMappings}},[{{targetDataItem.name}}]{{/each}}
     ORDER BY 
        MIN({{../metadataConfiguration.loadDateTimeAttribute}})
@@ -35,11 +35,11 @@ FROM
 ({{/if}}{{/each}}
     {{#each dataObjectMappings }}
     SELECT {{#each businessKeys}} {{#unless @first}} {{#each businessKeyComponentMapping}}
-        CAST({{sourceDataItems.0.name}} AS NVARCHAR(100)) AS {{targetDataItem.name}}{{../../@index}},{{/each}}{{/unless}}{{/each}}{{#each dataItemMappings}}
+        CAST({{sourceDataItems.0.name}} AS NVARCHAR(100)) AS {{targetDataItem.name}}{{@../index }},{{/each}}{{/unless}}{{/each}}{{#each dataItemMappings}}
         [{{sourceDataItems.0.name}}] AS [{{targetDataItem.name}}],{{/each}}
         {{../metadataConfiguration.recordSourceAttribute}},
         MIN({{../metadataConfiguration.loadDateTimeAttribute}}) AS {{../metadataConfiguration.loadDateTimeAttribute}}
-    FROM [{{sourceDataObjects.0.name}}]
+    FROM [{{sourceDataObjects.0.dataObjectConnection.extensions.1.value}}].[{{sourceDataObjects.0.name}}]
     WHERE {{#each businessKeys}} {{#unless @first}} {{#each businessKeyComponentMapping}}
        {{sourceDataItems.0.name}} IS NOT NULL{{#unless @last}} AND{{/unless}}{{/each}}{{#unless @last}} AND{{/unless}}{{/unless}} {{/each}}
        {{#each dataItemMappings}}
@@ -51,7 +51,7 @@ FROM
        {{../metadataConfiguration.recordSourceAttribute}}{{#unless @last}}UNION{{/unless}}
   ) LINK_selection
   GROUP BY {{#each businessKeys}} {{#unless @first}} {{#each businessKeyComponentMapping}}
-     {{targetDataItem.name}}{{../../@index}}{{#unless @last}},{{/unless}}{{/each}},{{/unless}}{{/each}}
+     {{targetDataItem.name}}{{@../index }}{{#unless @last}},{{/unless}}{{/each}},{{/unless}}{{/each}}
      {{#each dataItemMappings}}
      [{{targetDataItem.name}}],{{/each}}
      {{../metadataConfiguration.recordSourceAttribute}} {{/each}}
diff --git a/Virtual_EDW/LoadPatterns/loadPatternSatelliteView.Handlebars b/Virtual_EDW/LoadPatterns/loadPatternSatelliteView.Handlebars
@@ -108,7 +108,7 @@ FROM
            HASHBYTES('MD5',{{#each dataItemMappings}}
             ISNULL(RTRIM(CONVERT(NVARCHAR(100),{{sourceDataItems.0.name}})), 'N/A') + '#~!'{{#unless @last}} +{{/unless}}{{/each}}
            ) AS COMBINED_VALUE
-        FROM {{sourceDataObjects.0.name}}
+        FROM [{{sourceDataObjects.0.dataObjectConnection.extensions.1.value}}].[{{sourceDataObjects.0.name}}]
       {{#if filterCriterion}}WHERE {{filterCriterion}} {{/if}}
         UNION
         SELECT DISTINCT
@@ -122,7 +122,7 @@ FROM
           {{stringcompare targetDataItem.dataItemClassification.0.classification 'MultiActive'}}[{{sourceDataItems.0.name}}]{{else}}NULL{{/stringcompare}} AS [{{sourceDataItems.0.name}}],
           {{/each}}
           0x00000000000000000000000000000000 AS COMBINED_VALUE
-        FROM {{sourceDataObjects.0.name}}
+        FROM [{{sourceDataObjects.0.dataObjectConnection.extensions.1.value}}].[{{sourceDataObjects.0.name}}]
    ) sub
 ) combined_value
 WHERE 
diff --git a/Virtual_EDW/LoadPatterns/loadPatternSatelliteViewZeroRecord.Handlebars b/Virtual_EDW/LoadPatterns/loadPatternSatelliteViewZeroRecord.Handlebars

Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,15 @@ public FormMain()`
`34`	`34`	`InitializeComponent();`
`35`	`35`
`36`	`36`	`// Set the version of the build for everything`
`37`		`- const string versionNumberForApplication = "v1.6.5";`
	`37`	`+ const string versionNumberForApplication = "v1.6.6";`
`38`	`38`
`39`	`39`	`Text = $"Virtual Data Warehouse - {versionNumberForApplication}";`
	`40`	`+ labelWelcome.Text = $"{labelWelcome.Text} - { versionNumberForApplication}";`
	`41`	`+ ;`
`40`	`42`	`VdwConfigurationSettings.VdwEventLog.Add(Event.CreateNewEvent(EventTypes.Information, $"{Text}."));`
`41`	`43`
	`44`	`+`
	`45`	`+`
`42`	`46`	`#region Root Paths`
`43`	`47`	`// Make sure the root directories exist, based on (tool) parameters`
`44`	`48`
`@@ -1625,5 +1629,10 @@ private void tabControlMain_SelectedIndexChanged(object sender, EventArgs e)`
`1625`	`1629`	`FormBase.VdwConfigurationSettings.SelectedMainTab = tabControlMain.SelectedTab.Name;`
`1626`	`1630`	`}`
`1627`	`1631`	`}`
	`1632`	`+`
	`1633`	`+ private void richTextBoxMainScreen_TextChanged(object sender, EventArgs e)`
	`1634`	`+ {`
	`1635`	`+`
	`1636`	`+ }`
`1628`	`1637`	`}`
`1629`	`1638`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ FROM`
`28`	`28`	`stg.[{{../metadataConfiguration.loadDateTimeAttribute}}],`
`29`	`29`	`-1 AS [{{../metadataConfiguration.etlProcessAttribute}}],`
`30`	`30`	`stg.[{{../metadataConfiguration.recordSourceAttribute}}]`
`31`		`- FROM [{{sourceDataObjects.0.name}}] stg`
	`31`	`+ FROM [{{sourceDataObjects.0.dataObjectConnection.extensions.1.value}}].[{{sourceDataObjects.0.name}}] stg`
`32`	`32`	`WHERE NOT EXISTS`
`33`	`33`	`(`
`34`	`34`	`SELECT 1`