GridReader IAsyncDisposable

ZeeLyn · Jul 25, 2023 · 78048c3 · 78048c3
1 parent ebc1aad
commit 78048c3
Show file tree

Hide file tree

Showing 13 changed files with 384 additions and 160 deletions.
diff --git a/build.cake b/build.cake
@@ -5,7 +5,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 var output=Argument<string>("output", "./Output");
-var version=Argument<string>("version", "4.2.3");
+var version=Argument<string>("version", "4.2.4");
 var target = Argument<string>("target", "Default");
 var release = Argument<bool>("release", true);
 var nugetApiKey = Argument<string>("nugetApiKey", null);

diff --git a/src/Dapper.Extensions.Caching.Memory/Dapper.Extensions.Caching.Memory.csproj b/src/Dapper.Extensions.Caching.Memory/Dapper.Extensions.Caching.Memory.csproj
@@ -7,7 +7,7 @@
     <PackageId>Dapper.Extensions.Caching.Memory</PackageId>
     <Description>A dapper extension library. Support MySQL,SQL Server,PostgreSQL,SQLite and ODBC, Support cache.</Description>
     <icon>https://raw.githubusercontent.com/DapperLib/Dapper/main/Dapper.png</icon>
-    <Version>4.2.3</Version>
+    <Version>4.2.4</Version>
     <Authors>Owen</Authors>
     <PackageTags>Dapper,Dapper Extensions,DapperExtensions,Dapper.Extensions.NetCore,Extensions,DataBase,Sql Server,MSSQL,MySQL,PostgreSQL,SQLite,ODBC,Cahce,Caching,Redis,Memory,RedisCaching,MemoryCaching</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/src/Dapper.Extensions.Caching.Redis/Dapper.Extensions.Caching.Redis.csproj b/src/Dapper.Extensions.Caching.Redis/Dapper.Extensions.Caching.Redis.csproj
@@ -7,7 +7,7 @@
     <PackageId>Dapper.Extensions.Caching.Redis</PackageId>
     <Description>A dapper extension library. Support MySQL,SQL Server,PostgreSQL,SQLite and ODBC, Support cache.</Description>
     <icon>https://raw.githubusercontent.com/DapperLib/Dapper/main/Dapper.png</icon>
-    <Version>4.2.3</Version>
+    <Version>4.2.4</Version>
     <Authors>Owen</Authors>
     <PackageTags>Dapper,Dapper Extensions,DapperExtensions,Dapper.Extensions.NetCore,Extensions,DataBase,Sql Server,MSSQL,MySQL,PostgreSQL,SQLite,ODBC,Cahce,Caching,Redis,Memory,RedisCaching,MemoryCaching</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/src/Dapper.Extensions.MSSQL/Dapper.Extensions.MSSQL.csproj b/src/Dapper.Extensions.MSSQL/Dapper.Extensions.MSSQL.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net5.0;net6.0;net7.0</TargetFrameworks>
-    <Version>4.2.3</Version>
+    <Version>4.2.4</Version>
     <Description>A dapper extension library. Support MySQL,SQL Server,PostgreSQL,SQLite and ODBC, Support cache.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/ZeeLyn/Dapper.Extensions</PackageProjectUrl>

diff --git a/src/Dapper.Extensions.MSSQL/MsSqlDapper.cs b/src/Dapper.Extensions.MSSQL/MsSqlDapper.cs
@@ -7,11 +7,15 @@ namespace Dapper.Extensions.MSSQL
 {
     public class MsSqlDapper : BaseDapper<SqlConnection>
     {
-        public MsSqlDapper(IServiceProvider service, string connectionName = "DefaultConnection", bool enableMasterSlave = false, bool readOnly = false) : base(service, connectionName, enableMasterSlave, readOnly)
+        public MsSqlDapper(IServiceProvider service, string connectionName = "DefaultConnection",
+            bool enableMasterSlave = false, bool readOnly = false) : base(service, connectionName, enableMasterSlave,
+            readOnly)
         {
         }
 
-        public override async Task<PageResult<TReturn>> QueryPageAsync<TReturn>(string countSql, string dataSql, int pageindex, int pageSize, object param = null, int? commandTimeout = null, bool? enableCache = default, TimeSpan? cacheExpire = default, string cacheKey = default, bool forceUpdateCache = false)
+        public override async Task<PageResult<TReturn>> QueryPageAsync<TReturn>(string countSql, string dataSql,
+            int pageindex, int pageSize, object param = null, int? commandTimeout = null, bool? enableCache = default,
+            TimeSpan? cacheExpire = default, string cacheKey = default, bool forceUpdateCache = false)
         {
             if (pageindex < 1)
                 throw new ArgumentException("The pageindex cannot be less then 1.");
@@ -32,7 +36,11 @@ public override async Task<PageResult<TReturn>> QueryPageAsync<TReturn>(string c
             var sql = $"{countSql}{(countSql.EndsWith(";") ? "" : ";")}{dataSql}";
             return await CommandExecuteAsync(enableCache, async () =>
             {
+#if NET5_0_OR_GREATER
+                await using var multi = await Conn.Value.QueryMultipleAsync(sql, pars, Transaction, commandTimeout);
+#else
                 using var multi = await Conn.Value.QueryMultipleAsync(sql, pars, Transaction, commandTimeout);
+#endif
                 var count = (await multi.ReadAsync<int>()).FirstOrDefault();
                 var data = (await multi.ReadAsync<TReturn>()).ToList();
                 var result = new PageResult<TReturn>
@@ -51,8 +59,10 @@ public override async Task<PageResult<TReturn>> QueryPageAsync<TReturn>(string c
             }, sql, pars, cacheKey, cacheExpire, forceUpdateCache, pageindex, pageSize);
         }
 
-        public override async Task<PageResult<dynamic>> QueryPageAsync(string countSql, string dataSql, int pageindex, int pageSize, object param = null,
-            int? commandTimeout = null, bool? enableCache = default, TimeSpan? cacheExpire = default, string cacheKey = default, bool forceUpdateCache = false)
+        public override async Task<PageResult<dynamic>> QueryPageAsync(string countSql, string dataSql, int pageindex,
+            int pageSize, object param = null,
+            int? commandTimeout = null, bool? enableCache = default, TimeSpan? cacheExpire = default,
+            string cacheKey = default, bool forceUpdateCache = false)
         {
             if (pageindex < 1)
                 throw new ArgumentException("The pageindex cannot be less then 1.");
@@ -72,7 +82,11 @@ public override async Task<PageResult<dynamic>> QueryPageAsync(string countSql,
             var sql = $"{countSql}{(countSql.EndsWith(";") ? "" : ";")}{dataSql}";
             return await CommandExecuteAsync(enableCache, async () =>
             {
+#if NET5_0_OR_GREATER
+                await using var multi = await Conn.Value.QueryMultipleAsync(sql, pars, Transaction, commandTimeout);
+#else
                 using var multi = await Conn.Value.QueryMultipleAsync(sql, pars, Transaction, commandTimeout);
+#endif
                 var count = (await multi.ReadAsync<int>()).FirstOrDefault();
                 var data = (await multi.ReadAsync()).ToList();
                 var result = new PageResult<dynamic>
@@ -89,10 +103,11 @@ public override async Task<PageResult<dynamic>> QueryPageAsync(string countSql,
                     result.Page = result.TotalPage;
                 return result;
             }, sql, pars, cacheKey, cacheExpire, forceUpdateCache, pageindex, pageSize);
-
         }
 
-        public override PageResult<TReturn> QueryPage<TReturn>(string countSql, string dataSql, int pageindex, int pageSize, object param = null, int? commandTimeout = null, bool? enableCache = default, TimeSpan? cacheExpire = default, string cacheKey = default, bool forceUpdateCache = false)
+        public override PageResult<TReturn> QueryPage<TReturn>(string countSql, string dataSql, int pageindex,
+            int pageSize, object param = null, int? commandTimeout = null, bool? enableCache = default,
+            TimeSpan? cacheExpire = default, string cacheKey = default, bool forceUpdateCache = false)
         {
             if (pageindex < 1)
                 throw new ArgumentException("The pageindex cannot be less then 1.");
@@ -132,8 +147,10 @@ public override PageResult<TReturn> QueryPage<TReturn>(string countSql, string d
             }, sql, pars, cacheKey, cacheExpire, forceUpdateCache, pageindex, pageSize);
         }
 
-        public override PageResult<dynamic> QueryPage(string countSql, string dataSql, int pageindex, int pageSize, object param = null,
-            int? commandTimeout = null, bool? enableCache = default, TimeSpan? cacheExpire = default, string cacheKey = default, bool forceUpdateCache = false)
+        public override PageResult<dynamic> QueryPage(string countSql, string dataSql, int pageindex, int pageSize,
+            object param = null,
+            int? commandTimeout = null, bool? enableCache = default, TimeSpan? cacheExpire = default,
+            string cacheKey = default, bool forceUpdateCache = false)
         {
             if (pageindex < 1)
                 throw new ArgumentException("The pageindex cannot be less then 1.");
@@ -171,7 +188,6 @@ public override PageResult<dynamic> QueryPage(string countSql, string dataSql, i
                     result.Page = result.TotalPage;
                 return result;
             }, sql, pars, cacheKey, cacheExpire, forceUpdateCache, pageindex, pageSize);
-
         }
     }
-}
+}
diff --git a/src/Dapper.Extensions.MiniProfiler/Dapper.Extensions.MiniProfiler.csproj b/src/Dapper.Extensions.MiniProfiler/Dapper.Extensions.MiniProfiler.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net5.0;net6.0;net7.0</TargetFrameworks>
-    <Version>4.2.3</Version>
+    <Version>4.2.4</Version>
     <Authors>Owen</Authors>
     <Description>A dapper extension library. Support MySQL,SQL Server,PostgreSQL,SQLite and ODBC, Support cache.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/src/Dapper.Extensions.MySql/Dapper.Extensions.MySql.csproj b/src/Dapper.Extensions.MySql/Dapper.Extensions.MySql.csproj
@@ -8,7 +8,7 @@
     <icon>https://raw.githubusercontent.com/DapperLib/Dapper/main/Dapper.png</icon>
     <Authors>Owen</Authors>
     <Company>Owen</Company>
-    <Version>4.2.3</Version>
+    <Version>4.2.4</Version>
     <PackageTags>Dapper,Dapper Extensions,DapperExtensions,Dapper.Extensions.NetCore,Extensions,DataBase,Sql Server,MSSQL,MySQL,PostgreSQL,SQLite,ODBC,Cahce,Caching,Redis,Memory,RedisCaching,MemoryCaching</PackageTags>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageId>Dapper.Extensions.MySQL</PackageId>

diff --git a/src/Dapper.Extensions.Odbc/Dapper.Extensions.Odbc.csproj b/src/Dapper.Extensions.Odbc/Dapper.Extensions.Odbc.csproj
@@ -8,7 +8,7 @@
     <PackageTags>Dapper,Dapper Extensions,DapperExtensions,Dapper.Extensions.NetCore,Extensions,DataBase,Sql Server,MSSQL,MySQL,PostgreSQL,SQLite,ODBC,Cahce,Caching,Redis,Memory,RedisCaching,MemoryCaching</PackageTags>
     <icon>https://raw.githubusercontent.com/DapperLib/Dapper/main/Dapper.png</icon>
     <Authors>Owen</Authors>
-    <Version>4.2.3</Version>
+    <Version>4.2.4</Version>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageId>Dapper.Extensions.ODBC</PackageId>
     <Product>Dapper.Extensions.ODBC</Product>

diff --git a/src/Dapper.Extensions.Odbc/OdbcDapper.cs b/src/Dapper.Extensions.Odbc/OdbcDapper.cs
@@ -7,11 +7,15 @@ namespace Dapper.Extensions.Odbc
 {
     public class OdbcDapper : BaseDapper<OdbcConnection>
     {
-        public OdbcDapper(IServiceProvider service, string connectionName = "DefaultConnection", bool enableMasterSlave = false, bool readOnly = false) : base(service, connectionName, enableMasterSlave, readOnly)
+        public OdbcDapper(IServiceProvider service, string connectionName = "DefaultConnection",
+            bool enableMasterSlave = false, bool readOnly = false) : base(service, connectionName, enableMasterSlave,
+            readOnly)
         {
         }
 
-        public override async Task<PageResult<TReturn>> QueryPageAsync<TReturn>(string countSql, string dataSql, int pageindex, int pageSize, object param = null, int? commandTimeout = null, bool? enableCache = default, TimeSpan? cacheExpire = default, string cacheKey = default, bool forceUpdateCache = false)
+        public override async Task<PageResult<TReturn>> QueryPageAsync<TReturn>(string countSql, string dataSql,
+            int pageindex, int pageSize, object param = null, int? commandTimeout = null, bool? enableCache = default,
+            TimeSpan? cacheExpire = default, string cacheKey = default, bool forceUpdateCache = false)
         {
             if (pageindex < 1)
                 throw new ArgumentException("The pageindex cannot be less then 1.");
@@ -32,7 +36,11 @@ public override async Task<PageResult<TReturn>> QueryPageAsync<TReturn>(string c
             var sql = $"{countSql}{(countSql.EndsWith(";") ? "" : ";")}{dataSql}";
             return await CommandExecuteAsync(enableCache, async () =>
             {
+#if NET5_0_OR_GREATER
+                await using var multi = await Conn.Value.QueryMultipleAsync(sql, pars, Transaction, commandTimeout);
+#else
                 using var multi = await Conn.Value.QueryMultipleAsync(sql, pars, Transaction, commandTimeout);
+#endif
                 var count = (await multi.ReadAsync<int>()).FirstOrDefault();
                 var data = (await multi.ReadAsync<TReturn>()).ToList();
                 var result = new PageResult<TReturn>
@@ -51,8 +59,10 @@ public override async Task<PageResult<TReturn>> QueryPageAsync<TReturn>(string c
             }, sql, pars, cacheKey, cacheExpire, forceUpdateCache, pageindex, pageSize);
         }
 
-        public override async Task<PageResult<dynamic>> QueryPageAsync(string countSql, string dataSql, int pageindex, int pageSize, object param = null,
-            int? commandTimeout = null, bool? enableCache = default, TimeSpan? cacheExpire = default, string cacheKey = default, bool forceUpdateCache = false)
+        public override async Task<PageResult<dynamic>> QueryPageAsync(string countSql, string dataSql, int pageindex,
+            int pageSize, object param = null,
+            int? commandTimeout = null, bool? enableCache = default, TimeSpan? cacheExpire = default,
+            string cacheKey = default, bool forceUpdateCache = false)
         {
             if (pageindex < 1)
                 throw new ArgumentException("The pageindex cannot be less then 1.");
@@ -72,7 +82,11 @@ public override async Task<PageResult<dynamic>> QueryPageAsync(string countSql,
             var sql = $"{countSql}{(countSql.EndsWith(";") ? "" : ";")}{dataSql}";
             return await CommandExecuteAsync(enableCache, async () =>
             {
+#if NET5_0_OR_GREATER
+                await using var multi = await Conn.Value.QueryMultipleAsync(sql, pars, Transaction, commandTimeout);
+#else
                 using var multi = await Conn.Value.QueryMultipleAsync(sql, pars, Transaction, commandTimeout);
+#endif
                 var count = (await multi.ReadAsync<int>()).FirstOrDefault();
                 var data = (await multi.ReadAsync()).ToList();
                 var result = new PageResult<dynamic>
@@ -89,10 +103,11 @@ public override async Task<PageResult<dynamic>> QueryPageAsync(string countSql,
                     result.Page = result.TotalPage;
                 return result;
             }, sql, pars, cacheKey, cacheExpire, forceUpdateCache, pageindex, pageSize);
-
         }
 
-        public override PageResult<TReturn> QueryPage<TReturn>(string countSql, string dataSql, int pageindex, int pageSize, object param = null, int? commandTimeout = null, bool? enableCache = default, TimeSpan? cacheExpire = default, string cacheKey = default, bool forceUpdateCache = false)
+        public override PageResult<TReturn> QueryPage<TReturn>(string countSql, string dataSql, int pageindex,
+            int pageSize, object param = null, int? commandTimeout = null, bool? enableCache = default,
+            TimeSpan? cacheExpire = default, string cacheKey = default, bool forceUpdateCache = false)
         {
             if (pageindex < 1)
                 throw new ArgumentException("The pageindex cannot be less then 1.");
@@ -131,8 +146,10 @@ public override PageResult<TReturn> QueryPage<TReturn>(string countSql, string d
             }, sql, pars, cacheKey, cacheExpire, forceUpdateCache, pageindex, pageSize);
         }
 
-        public override PageResult<dynamic> QueryPage(string countSql, string dataSql, int pageindex, int pageSize, object param = null,
-            int? commandTimeout = null, bool? enableCache = default, TimeSpan? cacheExpire = default, string cacheKey = default, bool forceUpdateCache = false)
+        public override PageResult<dynamic> QueryPage(string countSql, string dataSql, int pageindex, int pageSize,
+            object param = null,
+            int? commandTimeout = null, bool? enableCache = default, TimeSpan? cacheExpire = default,
+            string cacheKey = default, bool forceUpdateCache = false)
         {
             if (pageindex < 1)
                 throw new ArgumentException("The pageindex cannot be less then 1.");
@@ -169,7 +186,6 @@ public override PageResult<dynamic> QueryPage(string countSql, string dataSql, i
                     result.Page = result.TotalPage;
                 return result;
             }, sql, pars, cacheKey, cacheExpire, forceUpdateCache, pageindex, pageSize);
-
         }
     }
-}
+}
diff --git a/src/Dapper.Extensions.PostgreSql/Dapper.Extensions.PostgreSql.csproj b/src/Dapper.Extensions.PostgreSql/Dapper.Extensions.PostgreSql.csproj
@@ -8,7 +8,7 @@
     <RepositoryUrl />
     <icon>https://raw.githubusercontent.com/DapperLib/Dapper/main/Dapper.png</icon>
     <PackageTags>Dapper,Dapper Extensions,DapperExtensions,Dapper.Extensions.NetCore,Extensions,DataBase,Sql Server,MSSQL,MySQL,PostgreSQL,SQLite,ODBC,Cahce,Caching,Redis,Memory,RedisCaching,MemoryCaching</PackageTags>
-    <Version>4.2.3</Version>
+    <Version>4.2.4</Version>
     <Authors>Owen</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageId>Dapper.Extensions.PostgreSQL</PackageId>

diff --git a/src/Dapper.Extensions.SQLite/Dapper.Extensions.SQLite.csproj b/src/Dapper.Extensions.SQLite/Dapper.Extensions.SQLite.csproj
@@ -8,7 +8,7 @@
     <RepositoryUrl></RepositoryUrl>
     <Description>A dapper extension library. Support MySQL,SQL Server,PostgreSQL,SQLite and ODBC, Support cache.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Version>4.2.3</Version>
+    <Version>4.2.4</Version>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <Authors>Owen</Authors>
     <LangVersion>latest</LangVersion>