Merge remote-tracking branch 'refs/remotes/ServiceStack/master'

Author: KevinHoward

README.md

@@ -413,7 +413,7 @@ The `UpdateAdd` API provides several Typed API's for updating existing values:
 db.UpdateAdd(() => new Person { Score = 3 }); 
 
 //Remove 5 points from Jackson Score
-db.UpdateAdd(() => new Person { Score = -5 }, x => where: x.LastName == "Jackson");
+db.UpdateAdd(() => new Person { Score = -5 }, where: x => x.LastName == "Jackson");
 
 //Graduate everyone and increase everyone's Score by 2 points 
 db.UpdateAdd(() => new Person { Points = 2, Graduated = true });

src/ServiceStack.OrmLite/OrmLiteWriteCommandExtensions.cs

@@ -287,11 +287,11 @@ public static T PopulateWithSqlReader<T>(this T objWithProperties,
             IOrmLiteDialectProvider dialectProvider, IDataReader reader, 
             Tuple<FieldDefinition, int, IOrmLiteConverter>[] indexCache, object[] values)
         {
-            try
-            {
-                values = PopulateValues(reader, values, dialectProvider);
+            values = PopulateValues(reader, values, dialectProvider);
 
-                foreach (var fieldCache in indexCache)
+            foreach (var fieldCache in indexCache)
+            {
+                try
                 {
                     var fieldDef = fieldCache.Item1;
                     var index = fieldCache.Item2;
@@ -331,11 +331,12 @@ public static T PopulateWithSqlReader<T>(this T objWithProperties,
                         }
                     }
                 }
+                catch (Exception ex)
+                {
+                    OrmLiteUtils.HandleException(ex);
+                }
             }
-            catch (Exception ex)
-            {
-                OrmLiteUtils.HandleException(ex);
-            }
+
             return objWithProperties;
         }
 

tests/ServiceStack.OrmLite.Tests/Issues/MappingFieldIssues.cs

@@ -0,0 +1,52 @@
+using System;
+using NUnit.Framework;
+using ServiceStack.DataAnnotations;
+
+namespace ServiceStack.OrmLite.Tests.Issues
+{
+    public class MappingFieldIssues : OrmLiteTestBase
+    {
+        public MappingFieldIssues() : base(Dialect.SqlServer) {}
+
+        public class OriginalTable
+        {
+            public int Id { get; set; }
+            public DateTime SaleDate { get; set; }
+            public TimeSpan SaleTime { get; set; }
+            public int NumberOfItems { get; set; }
+            public decimal Amount { get; set; }
+        }
+
+        [Alias("OriginalTable")]
+        public class MismatchTable
+        {
+            public int Id { get; set; }
+            public DateTime SaleDate { get; set; }
+            public DateTime SaleTime { get; set; }
+            public int NumberOfItems { get; set; }
+            public decimal Amount { get; set; }
+        }
+
+        [Test]
+        public void Does_map_remaining_columns_after_failed_mapping()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<OriginalTable>();
+                db.Insert(new OriginalTable
+                {
+                    Id = 1,
+                    SaleDate = new DateTime(2001, 01, 01),
+                    SaleTime = new TimeSpan(1,1,1,1),
+                    NumberOfItems = 2,
+                    Amount = 3
+                });
+
+                var result = db.SingleById<MismatchTable>(1);
+                Assert.That(result.NumberOfItems, Is.EqualTo(2));
+                Assert.That(result.Amount, Is.EqualTo(3));
+            }
+        }
+
+    }
+}