Merge branch 'master' of github.com:ServiceStack/ServiceStack.OrmLite

Author: mythz

src/ServiceStack.OrmLite/OrmLiteWriteExtensions.cs

@@ -602,7 +602,7 @@ internal static int Save<T>(this IDbCommand dbCmd, params T[] objs)
         internal static bool Save<T>(this IDbCommand dbCmd, T obj)
         {
             var id = obj.GetId();
-            var existingRow = dbCmd.SingleById<T>(id);
+            var existingRow = id != null ? dbCmd.SingleById<T>(id) : default(T);
             if (Equals(existingRow, default(T)))
             {
                 var modelDef = typeof(T).GetModelDefinition();
@@ -636,7 +636,8 @@ internal static int SaveAll<T>(this IDbCommand dbCmd, IEnumerable<T> objs)
             var firstRow = saveRows.FirstOrDefault();
             if (Equals(firstRow, default(T))) return 0;
 
-            var defaultIdValue = firstRow.GetId().GetType().GetDefaultValue();
+            var firstRowId = firstRow.GetId();
+            var defaultIdValue = firstRowId != null ? firstRowId.GetType().GetDefaultValue() : null;
 
             var idMap = defaultIdValue != null
                 ? saveRows.Where(x => !defaultIdValue.Equals(x.GetId())).ToSafeDictionary(x => x.GetId())

tests/ServiceStack.OrmLite.Tests/OrmLiteSaveTests.cs

@@ -58,6 +58,57 @@ public void SaveAll_populates_AutoIncrementId()
             }
         }
 
+        [Test]
+        public void Save_populates_NullableAutoIncrementId()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.CreateTable<PersonWithNullableAutoId>(overwrite: true);
+
+                var row = new PersonWithNullableAutoId
+                {
+                    FirstName = "Jimi",
+                    LastName = "Hendrix",
+                    Age = 27
+                };
+
+                db.Save(row);
+
+                Assert.That(row.Id, Is.Not.EqualTo(0));
+                Assert.That(row.Id, Is.Not.Null);
+            }
+        }
+
+        [Test]
+        public void SaveAll_populates_NullableAutoIncrementId()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.CreateTable<PersonWithNullableAutoId>(overwrite: true);
+
+                var rows = new[] {
+                    new PersonWithNullableAutoId {
+                        FirstName = "Jimi",
+                        LastName = "Hendrix",
+                        Age = 27
+                    },
+                    new PersonWithNullableAutoId {
+                        FirstName = "Kurt",
+                        LastName = "Cobain",
+                        Age = 27
+                    },
+                };
+
+                db.Save(rows);
+
+                Assert.That(rows[0].Id, Is.Not.EqualTo(0));
+                Assert.That(rows[0].Id, Is.Not.Null);
+                Assert.That(rows[1].Id, Is.Not.EqualTo(0));
+                Assert.That(rows[1].Id, Is.Not.Null);
+                Assert.That(rows[0].Id, Is.Not.EqualTo(rows[1].Id));
+            }
+        }
+
         [Test]
         public void Save_works_within_a_transaction()
         {

tests/ServiceStack.OrmLite.Tests/Shared/Person.cs

@@ -37,6 +37,15 @@ public class PersonWithAutoId
         public int Age { get; set; }
     }
 
+    public class PersonWithNullableAutoId
+    {
+        [AutoIncrement]
+        public int? Id { get; set; }
+        public string FirstName { get; set; }
+        public string LastName { get; set; }
+        public int Age { get; set; }
+    }
+
     public class EntityWithId
     {
         public int Id { get; set; }