Skip to content

Commit 459915c

Browse files
RoelantVosRoelantVos
committed
Fixes for next version
1 parent 839e24e commit 459915c

16 files changed

+73
-80
lines changed

‎ClassLibrary/DataWarehouseAutomation/DataWarehouseAutomation.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample Metadata", "Sample M
2121
Sample_Metadata\sampleBasic.json = Sample_Metadata\sampleBasic.json
2222
Sample_Metadata\sampleBasicWithExtensions.json = Sample_Metadata\sampleBasicWithExtensions.json
2323
Sample_Metadata\sampleCalculation.json = Sample_Metadata\sampleCalculation.json
24-
Sample_Metadata\sampleCustomFunctions.json = Sample_Metadata\sampleCustomFunctions.json
2524
Sample_Metadata\sampleFreeForm.json = Sample_Metadata\sampleFreeForm.json
2625
Sample_Metadata\sampleJsonStagingWithPsaDetails.json = Sample_Metadata\sampleJsonStagingWithPsaDetails.json
2726
Sample_Metadata\sampleMultipleDataItemMappings.json = Sample_Metadata\sampleMultipleDataItemMappings.json

‎ClassLibrary/DataWarehouseAutomation/Example_Project/Program.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ static void Main(string[] args)
1515
var sampleTemplateDirectory = AppDomain.CurrentDomain.BaseDirectory+@"..\..\..\..\Sample_Templates\";
1616
var sampleMetadataDirectory = AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\..\Sample_Metadata\";
1717

18-
//DisplayPatternResult(sampleTemplateDirectory + @"TemplateSampleBasic.handlebars", sampleMetadataDirectory + @"sampleBasic.json");
19-
//DisplayPatternResult(sampleTemplateDirectory + @"TemplateSampleBasicWithExtensions.handlebars", sampleMetadataDirectory + @"sampleBasicWithExtensions.json");
20-
//DisplayPatternResult(sampleTemplateDirectory + @"TemplateSampleMultipleDataItemMappings.handlebars", sampleMetadataDirectory + @"sampleMultipleDataItemMappings.json");
18+
DisplayPatternResult(sampleTemplateDirectory + @"TemplateSampleBasic.handlebars", sampleMetadataDirectory + @"sampleBasic.json");
19+
DisplayPatternResult(sampleTemplateDirectory + @"TemplateSampleBasicWithExtensions.handlebars", sampleMetadataDirectory + @"sampleBasicWithExtensions.json");
20+
DisplayPatternResult(sampleTemplateDirectory + @"TemplateSampleMultipleDataItemMappings.handlebars", sampleMetadataDirectory + @"sampleMultipleDataItemMappings.json");
2121
DisplayPatternResult(sampleTemplateDirectory + @"TemplateSampleSourceQuery.handlebars", sampleMetadataDirectory + @"sampleSourceQuery.json");
22-
//DisplayPatternResult(sampleTemplateDirectory + @"TemplateSampleSimpleDDL.handlebars", sampleMetadataDirectory + @"sampleSimpleDDL.json");
23-
//DisplayPatternResult(sampleTemplateDirectory + @"TemplateSampleCalculation.handlebars", sampleMetadataDirectory + @"sampleCalculation.json");
24-
//DisplayPatternResult(sampleTemplateDirectory + @"TemplateSatelliteView.handlebars", sampleMetadataDirectory + @"sampleVDW_Sat_Customer_v161.json");
25-
//DisplayPatternResult(sampleTemplateDirectory + @"TemplateSampleFreeForm.handlebars", sampleMetadataDirectory + @"sampleFreeForm.json");
26-
//DisplayPatternResult(sampleTemplateDirectory + @"TemplateSampleCustomFunctions.handlebars", sampleMetadataDirectory + @"sampleCustomFunctions.json");
22+
DisplayPatternResult(sampleTemplateDirectory + @"TemplateSampleSimpleDDL.handlebars", sampleMetadataDirectory + @"sampleSimpleDDL.json");
23+
DisplayPatternResult(sampleTemplateDirectory + @"TemplateSampleCalculation.handlebars", sampleMetadataDirectory + @"sampleCalculation.json");
24+
DisplayPatternResult(sampleTemplateDirectory + @"TemplateSatelliteView.handlebars", sampleMetadataDirectory + @"sampleVDW_Sat_Customer_v161.json");
25+
DisplayPatternResult(sampleTemplateDirectory + @"TemplateSampleFreeForm.handlebars", sampleMetadataDirectory + @"sampleFreeForm.json");
26+
DisplayPatternResult(sampleTemplateDirectory + @"TemplateSampleCustomFunctions.handlebars", sampleMetadataDirectory + @"sampleCustomFunctions.json");
2727

2828
Console.ReadKey();
2929
}

‎ClassLibrary/DataWarehouseAutomation/RunDwhAutomation/Program.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ private static void RunAutomation(Options options, string inputFileName, string
178178
{
179179
if (outputFileName == "")
180180
{
181-
//outputFileName = deserializedMapping.dataObjectMappings[0].mappingName; // you could read this from the free form mapping file, too
182181
try
183182
{
184183
outputFileName = (string) deserializedMapping["dataObjectMappings"][0]["mappingName"];

‎ClassLibrary/DataWarehouseAutomation/Sample_Metadata/sampleJsonStagingWithPsaDetails.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
"selectedDataObject": "infor.STG_tbcgct005",
1515
"generationDateTime": "2021-01-26T14:22:09.2991051+01:00"
1616
},
17-
"metadataFileName": "D:\\Virtual Data Warehouse\\Virtual Data Warehouse1.6.4EDW\\EDW\\infor.STG_tbcgct005.json",
17+
"metadataFileName": "tbcgct00.json",
1818
"dataObjectMappings": [
1919
{
2020
"mappingName": "STG_tbcgct005",
2121
"mappingClassifications": [
2222
{
23-
"id": 1,
23+
"id": "1",
2424
"classification": "StagingArea",
2525
"notes": "The mappings from source to the landing (staging) area."
2626
}

‎ClassLibrary/DataWarehouseAutomation/Sample_Metadata/sampleSourceQuery.json

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,10 @@
44
"mappingName": "MyDataObjectMapping",
55
"sourceDataObjects": [
66
{
7-
"name": "ExampleSourceDataObject"
7+
"dataQueryCode": "SELECT GETDATE()"
88
},
99
{
10-
"dataQueryCode": "SELECT GETDATE() AS CURRENTDATE",
11-
"dataQueryConnection": {
12-
"dataConnectionString": "ExampleConnectionString"
13-
},
14-
"dataQueryClassification": [
15-
{
16-
"id": 1,
17-
"classification": "Example Query"
18-
}
19-
]
10+
"dataQueryCode": "SELECT SYSDATETIMESTAMP()"
2011
}
2112
],
2213
"targetDataObject": {

‎ClassLibrary/DataWarehouseAutomation/Sample_Metadata/sampleTEAM_Hub.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
],
1919
"sourceDataObjects": [
2020
{
21-
"id": 0,
21+
"id": "0",
2222
"name": "PSA_PROFILER_PERSONALISED_COSTING",
2323
"dataItems": null,
2424
"dataObjectConnection": null
2525
}
2626
],
2727
"targetDataObject": {
28-
"id": 0,
28+
"id": "0",
2929
"name": "HUB_SEGMENT",
3030
"dataItems": null,
3131
"dataObjectConnection": {

‎ClassLibrary/DataWarehouseAutomation/Sample_Metadata/sampleTEAM_Hub_v161.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"mappingName": "PSA_PROFILER_CUSTOMER_OFFER",
1818
"mappingClassifications": [
1919
{
20-
"id": 2,
20+
"id": "2",
2121
"classification": "PersistentStagingArea",
2222
"notes": "The Persistent Staging Area (PSA) is the foundation of the Virtual Enterprise Data Warehouse (EDW). The ETL effectively compares and loads the delta into the PSA tables that correspond to the Staging Area counterparts. Because of this the logic is generated as 'SELECT INSERT' to load new data delta into this area."
2323
}

‎ClassLibrary/DataWarehouseAutomation/Sample_Metadata/sampleTEAM_LSAT.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
"mappingName": "LSAT_CUSTOMER_COSTING",
1313
"mappingClassification": [
1414
{
15-
"id": 6,
15+
"id": "6",
1616
"classification": "NaturalBusinessRelationshipContext",
1717
"notes": "The Link Satellites describe the changes over time for the relationships (Links). This pattern supports normal (historical) Link Satellites."
1818
}
1919
],
2020
"sourceDataObjects": [
2121
{
22-
"id": 0,
22+
"id": "0",
2323
"name": "PSA_PROFILER_PERSONALISED_COSTING",
2424
"dataItems": null,
2525
"dataObjectConnection": null
2626
}
2727
],
2828
"targetDataObject": {
29-
"id": 0,
29+
"id": "0",
3030
"name": "LSAT_CUSTOMER_COSTING",
3131
"dataItems": null,
3232
"dataObjectConnection": {

‎ClassLibrary/DataWarehouseAutomation/Sample_Metadata/sampleTEAMv16.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
"mappingName": "HUB_SEGMENT",
55
"mappingClassification": [
66
{
7-
"id": 3,
7+
"id": "3",
88
"classification": "CoreBusinessConcept",
99
"notes": "The source-to-target mappings for a Hub entity type. The Hub entities define the business concept and integration point for the model. In the Virtual Data Warehouse, the generated views combine the metadata from the various source to target mappings to create a single integrated Hub query."
1010
}
1111
],
1212
"sourceDataObjects": [
1313
{
14-
"id": 0,
14+
"id": "0",
1515
"name": "PSA_PROFILER_PERSONALISED_COSTING",
1616
"dataItems": null,
1717
"dataObjectConnection": null,
1818
"dataObjectClassification": null
1919
}
2020
],
2121
"targetDataObject": {
22-
"id": 0,
22+
"id": "0",
2323
"name": "HUB_SEGMENT",
2424
"dataItems": null,
2525
"dataObjectConnection": {
@@ -29,13 +29,13 @@
2929
},
3030
"relatedDataObject": [
3131
{
32-
"id": 0,
32+
"id": "0",
3333
"name": "HUB_SEGMENT",
3434
"dataItems": null,
3535
"dataObjectConnection": null,
3636
"dataObjectClassification": [
3737
{
38-
"id": 0,
38+
"id": "0",
3939
"classification": "Lookup",
4040
"notes": "Lookup table related to the source-to-target mapping"
4141
}
@@ -78,22 +78,22 @@
7878
"mappingName": "HUB_SEGMENT",
7979
"mappingClassification": [
8080
{
81-
"id": 3,
81+
"id": "3",
8282
"classification": "CoreBusinessConcept",
8383
"notes": "The source-to-target mappings for a Hub entity type. The Hub entities define the business concept and integration point for the model. In the Virtual Data Warehouse, the generated views combine the metadata from the various source to target mappings to create a single integrated Hub query."
8484
}
8585
],
8686
"sourceDataObjects": [
8787
{
88-
"id": 0,
88+
"id": "0",
8989
"name": "PSA_USERMANAGED_SEGMENT",
9090
"dataItems": null,
9191
"dataObjectConnection": null,
9292
"dataObjectClassification": null
9393
}
9494
],
9595
"targetDataObject": {
96-
"id": 0,
96+
"id": "0",
9797
"name": "HUB_SEGMENT",
9898
"dataItems": null,
9999
"dataObjectConnection": {
@@ -103,13 +103,13 @@
103103
},
104104
"relatedDataObject": [
105105
{
106-
"id": 0,
106+
"id": "0",
107107
"name": "HUB_SEGMENT",
108108
"dataItems": null,
109109
"dataObjectConnection": null,
110110
"dataObjectClassification": [
111111
{
112-
"id": 0,
112+
"id": "0",
113113
"classification": "Lookup",
114114
"notes": "Lookup table related to the source-to-target mapping"
115115
}

‎ClassLibrary/DataWarehouseAutomation/Sample_Metadata/sampleVDW_Hub.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"classification": null,
66
"sourceDataObjects": [
77
{
8-
"id": 0,
8+
"id": "0",
99
"name": "PSA_PROFILER_CUST_MEMBERSHIP",
1010
"dataItems": null
1111
}
1212
],
1313
"targetDataObject": {
14-
"id": 0,
14+
"id": "0",
1515
"name": "HUB_CUSTOMER",
1616
"dataItems": null
1717
},
@@ -54,13 +54,13 @@
5454
"classification": null,
5555
"sourceDataObjects": [
5656
{
57-
"id": 0,
57+
"id": "0",
5858
"name": "PSA_PROFILER_CUSTOMER_OFFER",
5959
"dataItems": null
6060
}
6161
],
6262
"targetDataObject": {
63-
"id": 0,
63+
"id": "0",
6464
"name": "HUB_CUSTOMER",
6565
"dataItems": null
6666
},
@@ -103,13 +103,13 @@
103103
"classification": null,
104104
"sourceDataObjects": [
105105
{
106-
"id": 0,
106+
"id": "0",
107107
"name": "PSA_PROFILER_CUSTOMER_PERSONAL",
108108
"dataItems": null
109109
}
110110
],
111111
"targetDataObject": {
112-
"id": 0,
112+
"id": "0",
113113
"name": "HUB_CUSTOMER",
114114
"dataItems": null
115115
},
@@ -152,13 +152,13 @@
152152
"classification": null,
153153
"sourceDataObjects": [
154154
{
155-
"id": 0,
155+
"id": "0",
156156
"name": "PSA_PROFILER_PERSONALISED_COSTING",
157157
"dataItems": null
158158
}
159159
],
160160
"targetDataObject": {
161-
"id": 0,
161+
"id": "0",
162162
"name": "HUB_CUSTOMER",
163163
"dataItems": null
164164
},

0 commit comments

Comments
 (0)