Merge pull request #1180 from AndrewNikolin/master

Honour cache expiration from ctor if not passed explicitly

Author: mikependon

RepoDb.Core/RepoDb/BaseRepository.cs

@@ -316,14 +316,14 @@ public IEnumerable<TEntity> ExecuteQuery(string commandText,
             object param = null,
             CommandType? commandType = null,
             string cacheKey = null,
-            int? cacheItemExpiration = Constant.DefaultCacheItemExpirationInMinutes,
+            int? cacheItemExpiration = null,
             IDbTransaction transaction = null)
         {
             return DbRepository.ExecuteQuery<TEntity>(commandText: commandText,
                 param: param,
                 commandType: commandType,
                 cacheKey: cacheKey,
-                cacheItemExpiration: cacheItemExpiration,
+                cacheItemExpiration: cacheItemExpiration ?? CacheItemExpiration,
                 transaction: transaction);
         }
 
@@ -354,15 +354,15 @@ public Task<IEnumerable<TEntity>> ExecuteQueryAsync(string commandText,
             object param = null,
             CommandType? commandType = null,
             string cacheKey = null,
-            int? cacheItemExpiration = Constant.DefaultCacheItemExpirationInMinutes,
+            int? cacheItemExpiration = null,
             IDbTransaction transaction = null,
             CancellationToken cancellationToken = default)
         {
             return DbRepository.ExecuteQueryAsync<TEntity>(commandText: commandText,
                 param: param,
                 commandType: commandType,
                 cacheKey: cacheKey,
-                cacheItemExpiration: cacheItemExpiration,
+                cacheItemExpiration: cacheItemExpiration ?? CacheItemExpiration,
                 transaction: transaction,
                 cancellationToken: cancellationToken);
         }

RepoDb.Core/RepoDb/DbRepository.cs

@@ -368,7 +368,7 @@ public IEnumerable<dynamic> ExecuteQuery(string commandText,
             object param = null,
             CommandType? commandType = null,
             string cacheKey = null,
-            int? cacheItemExpiration = Constant.DefaultCacheItemExpirationInMinutes,
+            int? cacheItemExpiration = null,
             IDbTransaction transaction = null)
         {
             // Create a connection
@@ -381,7 +381,7 @@ public IEnumerable<dynamic> ExecuteQuery(string commandText,
                     param: param,
                     commandType: commandType,
                     cacheKey: cacheKey,
-                    cacheItemExpiration: cacheItemExpiration,
+                    cacheItemExpiration: cacheItemExpiration ?? CacheItemExpiration,
                     commandTimeout: CommandTimeout,
                     transaction: transaction,
                     cache: Cache);
@@ -420,7 +420,7 @@ public async Task<IEnumerable<dynamic>> ExecuteQueryAsync(string commandText,
             object param = null,
             CommandType? commandType = null,
             string cacheKey = null,
-            int? cacheItemExpiration = Constant.DefaultCacheItemExpirationInMinutes,
+            int? cacheItemExpiration = null,
             IDbTransaction transaction = null,
             CancellationToken cancellationToken = default)
         {
@@ -434,7 +434,7 @@ public async Task<IEnumerable<dynamic>> ExecuteQueryAsync(string commandText,
                     param: param,
                     commandType: commandType,
                     cacheKey: cacheKey,
-                    cacheItemExpiration: cacheItemExpiration,
+                    cacheItemExpiration: cacheItemExpiration ?? CacheItemExpiration,
                     commandTimeout: CommandTimeout,
                     transaction: transaction,
                     cache: Cache,
@@ -474,7 +474,7 @@ public IEnumerable<TEntity> ExecuteQuery<TEntity>(string commandText,
             object param = null,
             CommandType? commandType = null,
             string cacheKey = null,
-            int? cacheItemExpiration = Constant.DefaultCacheItemExpirationInMinutes,
+            int? cacheItemExpiration = null,
             IDbTransaction transaction = null)
             where TEntity : class
         {
@@ -488,7 +488,7 @@ public IEnumerable<TEntity> ExecuteQuery<TEntity>(string commandText,
                     param: param,
                     commandType: commandType,
                     cacheKey: cacheKey,
-                    cacheItemExpiration: cacheItemExpiration,
+                    cacheItemExpiration: cacheItemExpiration ?? CacheItemExpiration,
                     commandTimeout: CommandTimeout,
                     transaction: transaction,
                     cache: Cache);
@@ -528,7 +528,7 @@ public async Task<IEnumerable<TEntity>> ExecuteQueryAsync<TEntity>(string comman
             object param = null,
             CommandType? commandType = null,
             string cacheKey = null,
-            int? cacheItemExpiration = Constant.DefaultCacheItemExpirationInMinutes,
+            int? cacheItemExpiration = null,
             IDbTransaction transaction = null,
             CancellationToken cancellationToken = default)
             where TEntity : class
@@ -543,7 +543,7 @@ public async Task<IEnumerable<TEntity>> ExecuteQueryAsync<TEntity>(string comman
                     param: param,
                     commandType: commandType,
                     cacheKey: cacheKey,
-                    cacheItemExpiration: cacheItemExpiration,
+                    cacheItemExpiration: cacheItemExpiration ?? CacheItemExpiration,
                     commandTimeout: CommandTimeout,
                     transaction: transaction,
                     cache: Cache,