Merge branch 'tkestowicz-master' into master.

Author: mrworkman

src/LinqToExcel.Tests/ColumnMappings_IntegrationTests.cs

@@ -3,7 +3,6 @@
 using NUnit.Framework;
 using System.IO;
 using log4net.Core;
-using System.Data.OleDb;
 
 namespace LinqToExcel.Tests
 {
@@ -139,5 +138,19 @@ public void annotated_properties_map_to_columns()
             Assert.AreEqual(new DateTime(1988, 7, 26), rival.StartDate, "StartDate");
             Assert.AreEqual("N", rival.IsActive, "IsActive");
         }
+
+        [Test]
+        public void two_transformations_with_the_same_property_but_in_different_types()
+        {
+            _repo.AddTransformation<Transformation1>(x => x.Value, x => x);
+            _repo.AddTransformation<Transformation2>(x => x.Value, x => x);
+
+            var value1 = _repo.Worksheet<Transformation1>("Transformation1").First().Value;
+            var value2 = _repo.Worksheet<Transformation2>("Transformation2").First().Value;
+
+            Assert.AreEqual(1, value1);
+            Assert.AreEqual("some different value", value2);
+        }
+
     }
 }

src/LinqToExcel.Tests/ConfiguredWorksheetName_IntegrationTests.cs

@@ -50,7 +50,7 @@ public void worksheetIndex_of_2_uses_third_table_name_orderedby_name()
         [Test]
         public void worksheetIndex_too_high_throws_exception()
         {
-            Assert.That(() => from c in ExcelQueryFactory.Worksheet<Company>(8, _excelFileName, new LogManagerFactory())
+            Assert.That(() => from c in ExcelQueryFactory.Worksheet<Company>(100, _excelFileName, new LogManagerFactory())
                               select c,
             Throws.TypeOf<DataException>());
         }

src/LinqToExcel.Tests/ExcelFiles/Companies.xls

@@ -80,8 +80,9 @@ public void GetWorksheetNames_returns_worksheet_names()
 
             var worksheetNames = excel.GetWorksheetNames();
             Assert.AreEqual(
-                "ColumnMappings, IMEX Table, Invalid Cast, More Companies, Null Dates, Range1, Sheet1, TrimSpaces",
-                string.Join(", ", worksheetNames.ToArray()));
+                "ColumnMappings, IMEX Table, Invalid Cast, More Companies, Null Dates, Range1, Sheet1, Transformation1, Transformation2, TrimSpaces",
+                string.Join(", ", worksheetNames.ToArray())
+            );
         }
 
         [Test]

src/LinqToExcel.Tests/ExcelQueryFactoryTests.cs

@@ -119,6 +119,7 @@
     <Compile Include="Row_IntegrationTests.cs" />
     <Compile Include="Row_SQLStatement_UnitTests.cs" />
     <Compile Include="SQLLogStatements_Helper.cs" />
+    <Compile Include="Transformations.cs" />
     <Compile Include="UnSupportedMethods.cs" />
     <Compile Include="WorkSheetNameTests.cs" />
   </ItemGroup>

src/LinqToExcel.Tests/LinqToExcel.Tests.csproj

@@ -0,0 +1,12 @@
+namespace LinqToExcel.Tests
+{
+    public class Transformation1
+    {
+        public int Value { get; set; }
+    }
+
+    public class Transformation2
+    {
+        public string Value { get; set; }
+    }
+}

src/LinqToExcel.Tests/Transformations.cs

@@ -137,7 +137,7 @@ private string GetPropertyName<TSheetData>(Expression<Func<TSheetData, object>>
         /// </example>
         public void AddTransformation<TSheetData>(Expression<Func<TSheetData, object>> property, Func<string, object> transformation)
         {
-            _transformations.Add(GetPropertyName(property), transformation);
+            _transformations.Add(string.Format("{0}.{1}", typeof(TSheetData).Name, GetPropertyName(property)), transformation);
         }
 
         /// <summary>

src/LinqToExcel/ExcelQueryFactory.cs

@@ -331,7 +331,7 @@ private IEnumerable<object> GetTypeResults(IDataReader data, IEnumerable<string>
                     {
                         if (columns.Contains(columnName))
                         {
-                            var value = GetColumnValue(data, columnName, prop.Name).Cast(prop.PropertyType);
+                            var value = GetColumnValue(data, columnName, prop.Name, fromType.Name).Cast(prop.PropertyType);
                             value = TrimStringValue(value);
                             result.SetProperty(prop.Name, value);
                         }
@@ -402,11 +402,12 @@ private bool ColumnIsNotMapped(string columnName)
             return !_args.ColumnMappings.Values.Contains(columnName);
         }
 
-        private object GetColumnValue(IDataRecord data, string columnName, string propertyName)
+        private object GetColumnValue(IDataRecord data, string columnName, string propertyName, string typeName)
         {
+            var transformationKey = string.Format("{0}.{1}", typeName, propertyName);
             //Perform the property transformation if there is one
-            return (_args.Transformations.ContainsKey(propertyName)) ?
-                _args.Transformations[propertyName](data[columnName].ToString()) :
+            return (_args.Transformations.ContainsKey(transformationKey)) ?
+                _args.Transformations[transformationKey](data[columnName].ToString()) :
                 data[columnName];
         }