Support [AutoId] Guid on InsertAsync/SaveAsync

Author: mythz

src/ServiceStack.OrmLite/Async/OrmLiteWriteCommandExtensionsAsync.cs

@@ -266,7 +266,7 @@ internal static Task<int> DeleteAsync(this IDbCommand dbCmd, Type tableType, str
             return dbCmd.ExecuteSqlAsync(dbCmd.GetDialectProvider().ToDeleteStatement(tableType, sql), token);
         }
 
-        internal static Task<long> InsertAsync<T>(this IDbCommand dbCmd, T obj, Action<IDbCommand> commandFilter, bool selectIdentity, CancellationToken token)
+        internal static async Task<long> InsertAsync<T>(this IDbCommand dbCmd, T obj, Action<IDbCommand> commandFilter, bool selectIdentity, CancellationToken token)
         {
             OrmLiteConfig.InsertFilter?.Invoke(dbCmd, obj);
 
@@ -278,11 +278,20 @@ internal static Task<long> InsertAsync<T>(this IDbCommand dbCmd, T obj, Action<I
             dialectProvider.SetParameterValues<T>(dbCmd, obj);
 
             commandFilter?.Invoke(dbCmd);
+            
+            if (dialectProvider.HasInsertReturnValues(ModelDefinition<T>.Definition))
+            {
+                using (var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token))
+                using (reader)
+                {
+                    return reader.PopulateReturnValues(dialectProvider, obj);
+                }
+            }
 
             if (selectIdentity)
-                return dialectProvider.InsertAndGetLastInsertIdAsync<T>(dbCmd, token);
+                return await dialectProvider.InsertAndGetLastInsertIdAsync<T>(dbCmd, token);
 
-            return dbCmd.ExecNonQueryAsync(token).Then(i => (long)i);
+            return await dbCmd.ExecNonQueryAsync(token).Then(i => (long)i);
         }
 
         internal static Task InsertAsync<T>(this IDbCommand dbCmd, Action<IDbCommand> commandFilter, CancellationToken token, params T[] objs)

src/ServiceStack.OrmLite/OrmLiteWriteCommandExtensions.cs

@@ -647,24 +647,12 @@ internal static long Insert<T>(this IDbCommand dbCmd, T obj, Action<IDbCommand>
 
             commandFilter?.Invoke(dbCmd); //dbCmd.OnConflictInsert() needs to be applied before last insert id
 
-            var modelDef = typeof(T).GetModelDefinition();
-            if (dialectProvider.HasInsertReturnValues(modelDef))
+            if (dialectProvider.HasInsertReturnValues(ModelDefinition<T>.Definition))
             {
                 using (var reader = dbCmd.ExecReader(dbCmd.CommandText))
                 using (reader)
                 {
-                    if (reader.Read())
-                    {
-                        var values = new object[reader.FieldCount];
-                        var indexCache = reader.GetIndexFieldsCache(ModelDefinition<T>.Definition, dialectProvider);
-                        obj.PopulateWithSqlReader(dialectProvider, reader, indexCache, values);
-                        if ((modelDef.PrimaryKey != null) && modelDef.PrimaryKey.AutoIncrement)
-                        {
-                            var id = modelDef.GetPrimaryKey(obj);
-                            return Convert.ToInt64(id);
-                        }
-                    }
-                    return 0;
+                    return reader.PopulateReturnValues(dialectProvider, obj);
                 }
             }
 
@@ -678,6 +666,24 @@ internal static long Insert<T>(this IDbCommand dbCmd, T obj, Action<IDbCommand>
             return dbCmd.ExecNonQuery();
         }
 
+        internal static long PopulateReturnValues<T>(this IDataReader reader, IOrmLiteDialectProvider dialectProvider, T obj)
+        {
+            if (reader.Read())
+            {
+                var modelDef = ModelDefinition<T>.Definition;
+                var values = new object[reader.FieldCount];
+                var indexCache = reader.GetIndexFieldsCache(modelDef, dialectProvider);
+                obj.PopulateWithSqlReader(dialectProvider, reader, indexCache, values);
+                if ((modelDef.PrimaryKey != null) && modelDef.PrimaryKey.AutoIncrement)
+                {
+                    var id = modelDef.GetPrimaryKey(obj);
+                    return Convert.ToInt64(id);
+                }
+            }
+
+            return 0;
+        }
+
         internal static void Insert<T>(this IDbCommand dbCmd, Action<IDbCommand> commandFilter, params T[] objs)
         {
             dbCmd.InsertAll(objs: objs, commandFilter: commandFilter);