added LanguageID and ShopID in the "select" for the sql if they are n…

…ot already added as either column mappings or conditionals.

src/EcomSourceReader.cs

@@ -3,6 +3,7 @@
 using Dynamicweb.DataIntegration.Integration.Interfaces;
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
 
@@ -52,6 +53,23 @@ protected string GetColumnsFromMappingConditions(HashSet<string> columnsToSkip)
         return ret;
     }
 
+    private string GetColumnsFromSettings()
+    {
+        string result = string.Empty;
+        string columnNameForLanguageId = MappingExtensions.GetLanguageIdColumnName(mapping.SourceTable.Name);
+        if (!string.IsNullOrEmpty(columnNameForLanguageId) && !IsColumnUsedInMappingConditions(columnNameForLanguageId) && !Columns.ContainsKey(columnNameForLanguageId.ToLower()))
+        {
+            result = $"[{columnNameForLanguageId}], ";
+        }
+
+        string columnNameForShopId = MappingExtensions.GetShopIdColumnName(mapping.SourceTable.Name);
+        if (!string.IsNullOrEmpty(columnNameForShopId) && !IsColumnUsedInMappingConditions(columnNameForShopId) && !Columns.ContainsKey(columnNameForShopId.ToLower()))
+        {
+            result += $"[{columnNameForShopId}], ";
+        }
+        return result;
+    }
+
     protected bool IsColumnUsedInMappingConditions(string columnName)
     {
         return mapping.Conditionals.Any(mc => string.Compare(mc.SourceColumn?.Name, columnName, true) == 0);
@@ -482,6 +500,7 @@ protected override string GetColumns()
                 result += GetColumnsFromMappingConditions();
                 break;
         }
+        result += GetColumnsFromSettings();
         result = result.Substring(0, result.Length - 2);
         return result;
     }