Using the new script type provider handles new dependency related column mappings and the associated values

Nicolaj Hansen · Nicolaj Hansen · commit 10fa014f341a · 2025-01-27T14:28:35.000+01:00
diff --git a/src/Dynamicweb.DataIntegration.Providers.DynamicwebProvider.csproj b/src/Dynamicweb.DataIntegration.Providers.DynamicwebProvider.csproj
@@ -23,7 +23,7 @@
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Dynamicweb.DataIntegration" Version="10.9.0" />
+    <PackageReference Include="Dynamicweb.DataIntegration" Version="10.11.2" />
     <PackageReference Include="Dynamicweb.Ecommerce" Version="10.9.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
diff --git a/src/DynamicwebProvider.cs b/src/DynamicwebProvider.cs
@@ -2,6 +2,7 @@
 using Dynamicweb.Data;
 using Dynamicweb.DataIntegration.Integration;
 using Dynamicweb.DataIntegration.Integration.Interfaces;
+using Dynamicweb.DataIntegration.Integration.ScriptTypes;
 using Dynamicweb.DataIntegration.ProviderHelpers;
 using Dynamicweb.Extensibility.AddIns;
 using Dynamicweb.Extensibility.Editors;
@@ -498,8 +499,10 @@ public override bool RunJob(Job job)
                                 {
                                     Column randomColumn = mapping.SourceTable.Columns.First();
                                     var languageColumnMapping = mapping.AddMapping(randomColumn, mapping.DestinationTable.Columns.Find(c => string.Compare(c.Name, MappingExtensions.GetLanguageIdColumnName(mapping.DestinationTable.Name), true) == 0));
-                                    languageColumnMapping.ScriptType = ScriptType.Constant;
-                                    languageColumnMapping.ScriptValue = defaultLanguage;
+                                    languageColumnMapping.ScriptTypeProvider = new ConstantScriptType() 
+                                    { 
+                                        ScriptValue = defaultLanguage 
+                                    };
                                 }
                             }
 
@@ -510,8 +513,10 @@ public override bool RunJob(Job job)
                                 {
                                     Column randomColumn = mapping.SourceTable.Columns.First();
                                     var shopColumnMapping = mapping.AddMapping(randomColumn, mapping.DestinationTable.Columns.Find(c => string.Compare(c.Name, MappingExtensions.GetShopIdColumnName(mapping.DestinationTable.Name), true) == 0));
-                                    shopColumnMapping.ScriptType = ScriptType.Constant;
-                                    shopColumnMapping.ScriptValue = Shop;
+                                    shopColumnMapping.ScriptTypeProvider = new ConstantScriptType()
+                                    {
+                                        ScriptValue = Shop
+                                    };
                                 }
                             }
 

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using Dynamicweb.Data;`
`3`	`3`	`using Dynamicweb.DataIntegration.Integration;`
`4`	`4`	`using Dynamicweb.DataIntegration.Integration.Interfaces;`
	`5`	`+using Dynamicweb.DataIntegration.Integration.ScriptTypes;`
`5`	`6`	`using Dynamicweb.DataIntegration.ProviderHelpers;`
`6`	`7`	`using Dynamicweb.Extensibility.AddIns;`
`7`	`8`	`using Dynamicweb.Extensibility.Editors;`
`@@ -498,8 +499,10 @@ public override bool RunJob(Job job)`
`498`	`499`	`{`
`499`	`500`	`Column randomColumn = mapping.SourceTable.Columns.First();`
`500`	`501`	`var languageColumnMapping = mapping.AddMapping(randomColumn, mapping.DestinationTable.Columns.Find(c => string.Compare(c.Name, MappingExtensions.GetLanguageIdColumnName(mapping.DestinationTable.Name), true) == 0));`
`501`		`- languageColumnMapping.ScriptType = ScriptType.Constant;`
`502`		`- languageColumnMapping.ScriptValue = defaultLanguage;`
	`502`	`+ languageColumnMapping.ScriptTypeProvider = new ConstantScriptType()`
	`503`	`+ {`
	`504`	`+ ScriptValue = defaultLanguage`
	`505`	`+ };`
`503`	`506`	`}`
`504`	`507`	`}`
`505`	`508`
`@@ -510,8 +513,10 @@ public override bool RunJob(Job job)`
`510`	`513`	`{`
`511`	`514`	`Column randomColumn = mapping.SourceTable.Columns.First();`
`512`	`515`	`var shopColumnMapping = mapping.AddMapping(randomColumn, mapping.DestinationTable.Columns.Find(c => string.Compare(c.Name, MappingExtensions.GetShopIdColumnName(mapping.DestinationTable.Name), true) == 0));`
`513`		`- shopColumnMapping.ScriptType = ScriptType.Constant;`
`514`		`- shopColumnMapping.ScriptValue = Shop;`
	`516`	`+ shopColumnMapping.ScriptTypeProvider = new ConstantScriptType()`
	`517`	`+ {`
	`518`	`+ ScriptValue = Shop`
	`519`	`+ };`
`515`	`520`	`}`
`516`	`521`	`}`
`517`	`522`