- fixed mapping when column does not exist

Author: eben-roux

Shuttle.Core.Data.Tests/QueryMapper/QueryMapperFixture.cs

@@ -42,5 +42,42 @@ select top 1
                 Assert.AreEqual(2, mappedRows.Count());
             }
         }
+
+        [Test]
+        public void Should_be_able_to_do_basic_mapping_even_though_columns_are_missing()
+        {
+            var mapper = new QueryMapper(new DatabaseGateway());
+
+            var queryRow = RawQuery.Create(@"
+select top 1
+    Id,
+    Name as NotMapped,
+    Age as TheAge
+from
+    BasicMapping
+");
+
+            var queryRows = RawQuery.Create(@"
+select
+    Id,
+    Name,
+    Age
+from
+    BasicMapping
+");
+
+            using (GetDatabaseContext())
+            {
+                var item = mapper.MapObject<BasicMapping>(queryRow);
+                var items = mapper.MapObjects<BasicMapping>(queryRows);
+
+                Assert.AreEqual(2, items.Count());
+
+                var mappedRow = mapper.MapRow<BasicMapping>(queryRow);
+                var mappedRows = mapper.MapRows<BasicMapping>(queryRows);
+
+                Assert.AreEqual(2, mappedRows.Count());
+            }
+        }
     }
 }

Shuttle.Core.Data/QueryMapper.cs

@@ -31,15 +31,15 @@ public QueryMapper(IDatabaseGateway databaseGateway)
 
             foreach (PropertyInfo pi in type.GetProperties())
             {
-                var value = row[pi.Name];
-
-                if (value == null)
-                {
-                    continue;
-                }
-
                 try
                 {
+                    var value = row.Table.Columns.Contains(pi.Name) ? row[pi.Name] : null;
+
+                    if (value == null)
+                    {
+                        continue;
+                    }
+
                     pi.SetValue(result, value, null);
                 }
                 catch