Change to Dispose datareader in a future callback in async API's

Author: mythz

src/ServiceStack.OrmLite/Async/OrmLiteUtilExtensionsAsync.cs

@@ -21,70 +21,70 @@ public static T CreateInstance<T>()
         public static Task<T> ConvertToAsync<T>(this IDataReader dataReader, IOrmLiteDialectProvider dialectProvider, CancellationToken token)
         {
             var fieldDefs = ModelDefinition<T>.Definition.AllFieldDefinitionsArray;
-            using (dataReader)
+            return dialectProvider.ReaderRead(dataReader, () =>
             {
-                return dialectProvider.ReaderRead(dataReader, () =>
-                {
-                    var row = CreateInstance<T>();
-                    var indexCache = dataReader.GetIndexFieldsCache(ModelDefinition<T>.Definition);
-                    row.PopulateWithSqlReader(dialectProvider, dataReader, fieldDefs, indexCache);
-                    return row;
-                }, token);
-            }
+                var row = CreateInstance<T>();
+                var indexCache = dataReader.GetIndexFieldsCache(ModelDefinition<T>.Definition);
+                row.PopulateWithSqlReader(dialectProvider, dataReader, fieldDefs, indexCache);
+                return row;
+            }, token).Then(t => { 
+                dataReader.Dispose();
+                return t;
+            });
         }
 
         public static Task<List<T>> ConvertToListAsync<T>(this IDataReader dataReader, IOrmLiteDialectProvider dialectProvider, CancellationToken token)
         {
             var fieldDefs = ModelDefinition<T>.Definition.AllFieldDefinitionsArray;
-            using (dataReader)
+            var indexCache = dataReader.GetIndexFieldsCache(ModelDefinition<T>.Definition);
+            return dialectProvider.ReaderEach(dataReader, () =>
             {
-                var indexCache = dataReader.GetIndexFieldsCache(ModelDefinition<T>.Definition);
-                return dialectProvider.ReaderEach(dataReader, () =>
-                {
-                    var row = CreateInstance<T>();
-                    row.PopulateWithSqlReader(dialectProvider, dataReader, fieldDefs, indexCache);
-                    return row;
-                }, token);
-            }
+                var row = CreateInstance<T>();
+                row.PopulateWithSqlReader(dialectProvider, dataReader, fieldDefs, indexCache);
+                return row;
+            }, token).Then(t => {
+                dataReader.Dispose();
+                return t;
+            });
         }
 
         public static Task<object> ConvertToAsync(this IDataReader dataReader, IOrmLiteDialectProvider dialectProvider, Type type, CancellationToken token)
         {
             var modelDef = type.GetModelDefinition();
             var fieldDefs = modelDef.AllFieldDefinitionsArray;
 
-            using (dataReader)
+            return dialectProvider.ReaderRead(dataReader, () =>
+            {
+                var row = type.CreateInstance();
+                var indexCache = dataReader.GetIndexFieldsCache(modelDef);
+                row.PopulateWithSqlReader(dialectProvider, dataReader, fieldDefs, indexCache);
+                return row;
+            }, token).Then(t =>
             {
-                return dialectProvider.ReaderRead(dataReader, () =>
-                {
-                    var row = type.CreateInstance();
-                    var indexCache = dataReader.GetIndexFieldsCache(modelDef);
-                    row.PopulateWithSqlReader(dialectProvider, dataReader, fieldDefs, indexCache);
-                    return row;
-                }, token);
-            }
+                dataReader.Dispose();
+                return t;
+            });
         }
 
         public static Task<IList> ConvertToListAsync(this IDataReader dataReader, IOrmLiteDialectProvider dialectProvider, Type type, CancellationToken token)
         {
             var modelDef = type.GetModelDefinition();
             var fieldDefs = modelDef.AllFieldDefinitionsArray;
 
-            using (dataReader)
+            var indexCache = dataReader.GetIndexFieldsCache(modelDef);
+            return dialectProvider.ReaderEach(dataReader, () =>
             {
-                var indexCache = dataReader.GetIndexFieldsCache(modelDef);
-                return dialectProvider.ReaderEach(dataReader, () =>
-                {
-                    var row = type.CreateInstance();
-                    row.PopulateWithSqlReader(dialectProvider, dataReader, fieldDefs, indexCache);
-                    return row;
-                }, token)
-                .Then(x => {
-                    var to = (IList)typeof(List<>).MakeGenericType(type).CreateInstance();
-                    x.Each(o => to.Add(o));
-                    return to;
-                });
-            }
+                var row = type.CreateInstance();
+                row.PopulateWithSqlReader(dialectProvider, dataReader, fieldDefs, indexCache);
+                return row;
+            }, token)
+            .Then(x =>
+            {
+                dataReader.Dispose();
+                var to = (IList)typeof(List<>).MakeGenericType(type).CreateInstance();
+                x.Each(o => to.Add(o));
+                return to;
+            });
         }
     }
 }

tests/ServiceStack.OrmLiteV45.Tests/SelectAsyncTests.cs

@@ -1,9 +1,22 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using AppDb;
 using NUnit.Framework;
+using ServiceStack.DataAnnotations;
+using ServiceStack.Model;
 
 namespace ServiceStack.OrmLite.Tests
 {
+    public class PocoWithBytes : IHasGuidId
+    {
+        [PrimaryKey]
+        public Guid Id { get; set; }
+
+        public byte[] Image { get; set; }
+
+        public string ContentType { get; set; }
+    }
+
     [TestFixture]
     public class SelectAsyncTests
         : OrmLiteTestBase
@@ -22,5 +35,20 @@ public async Task Can_SELECT_SingleAsync()
                 Assert.That(row.Id, Is.EqualTo("foo"));
             }
         }
+
+        [Test]
+        public async Task Can_SELECT_SingleAsyncForStrangeClass()
+        {
+            using (var db = OpenDbConnection())
+            {
+                db.DropAndCreateTable<PocoWithBytes>();
+
+                var bar = new PocoWithBytes { Id = Guid.NewGuid(), Image = new byte[1024 * 1024], ContentType = "image/jpeg" };
+                await db.InsertAsync(bar);
+
+                var blah = await db.SingleAsync(db.From<PocoWithBytes>().Where(x => x.Id == bar.Id));
+                Assert.That(blah, Is.Not.Null);
+            }
+        }
     }
 }