Skip to content

Commit 54af40d

Browse files
committed
fix FindAll with Joins
1 parent 7abd3a2 commit 54af40d

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

MicroOrm.Dapper.Repositories/DapperRepository.cs

+12-12
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ public virtual IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3>(
293293
}
294294

295295
/// <inheritdoc />
296-
public virtual IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3>(
296+
public virtual IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3, TChild4>(
297297
Expression<Func<TEntity, bool>> predicate,
298298
Expression<Func<TEntity, object>> tChild1,
299299
Expression<Func<TEntity, object>> tChild2,
@@ -302,11 +302,11 @@ public virtual IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3>(
302302
IDbTransaction transaction = null)
303303
{
304304
var sqlQuery = new SqlGenerator<TEntity>().GetSelectAll(predicate, tChild1, tChild2, tChild3, tChild4);
305-
return ExecuteJoinQuery<TChild1, TChild2, TChild3, DontMap, DontMap, DontMap>(sqlQuery, transaction, tChild1, tChild2, tChild3, tChild4);
305+
return ExecuteJoinQuery<TChild1, TChild2, TChild3, TChild4, DontMap, DontMap>(sqlQuery, transaction, tChild1, tChild2, tChild3, tChild4);
306306
}
307307

308308
/// <inheritdoc />
309-
public virtual IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3>(
309+
public virtual IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3, TChild4, TChild5>(
310310
Expression<Func<TEntity, bool>> predicate,
311311
Expression<Func<TEntity, object>> tChild1,
312312
Expression<Func<TEntity, object>> tChild2,
@@ -316,11 +316,11 @@ public virtual IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3>(
316316
IDbTransaction transaction = null)
317317
{
318318
var sqlQuery = new SqlGenerator<TEntity>().GetSelectAll(predicate, tChild1, tChild2, tChild3, tChild4, tChild5);
319-
return ExecuteJoinQuery<TChild1, TChild2, TChild3, DontMap, DontMap, DontMap>(sqlQuery, transaction, tChild1, tChild2, tChild3, tChild4, tChild5);
319+
return ExecuteJoinQuery<TChild1, TChild2, TChild3, TChild4, TChild5, DontMap>(sqlQuery, transaction, tChild1, tChild2, tChild3, tChild4, tChild5);
320320
}
321321

322322
/// <inheritdoc />
323-
public virtual IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3>(
323+
public virtual IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3, TChild4, TChild5, TChild6>(
324324
Expression<Func<TEntity, bool>> predicate,
325325
Expression<Func<TEntity, object>> tChild1,
326326
Expression<Func<TEntity, object>> tChild2,
@@ -331,7 +331,7 @@ public virtual IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3>(
331331
IDbTransaction transaction = null)
332332
{
333333
var sqlQuery = new SqlGenerator<TEntity>().GetSelectAll(predicate, tChild1, tChild2, tChild3, tChild4, tChild5, tChild6);
334-
return ExecuteJoinQuery<TChild1, TChild2, TChild3, DontMap, DontMap, DontMap>(sqlQuery, transaction, tChild1, tChild2, tChild3, tChild4, tChild5, tChild6);
334+
return ExecuteJoinQuery<TChild1, TChild2, TChild3, TChild4, TChild5, TChild6>(sqlQuery, transaction, tChild1, tChild2, tChild3, tChild4, tChild5, tChild6);
335335
}
336336

337337
/// <inheritdoc />
@@ -385,7 +385,7 @@ public virtual Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3
385385
}
386386

387387
/// <inheritdoc />
388-
public virtual Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3>(
388+
public virtual Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3, TChild4>(
389389
Expression<Func<TEntity, bool>> predicate,
390390
Expression<Func<TEntity, object>> tChild1,
391391
Expression<Func<TEntity, object>> tChild2,
@@ -394,11 +394,11 @@ public virtual Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3
394394
IDbTransaction transaction = null)
395395
{
396396
var sqlQuery = new SqlGenerator<TEntity>().GetSelectAll(predicate, tChild1, tChild2, tChild3, tChild4);
397-
return ExecuteJoinQueryAsync<TChild1, TChild2, TChild3, DontMap, DontMap, DontMap>(sqlQuery, transaction, tChild1, tChild2, tChild3, tChild4);
397+
return ExecuteJoinQueryAsync<TChild1, TChild2, TChild3, TChild4, DontMap, DontMap>(sqlQuery, transaction, tChild1, tChild2, tChild3, tChild4);
398398
}
399399

400400
/// <inheritdoc />
401-
public virtual Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3>(
401+
public virtual Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3, TChild4, TChild5>(
402402
Expression<Func<TEntity, bool>> predicate,
403403
Expression<Func<TEntity, object>> tChild1,
404404
Expression<Func<TEntity, object>> tChild2,
@@ -408,11 +408,11 @@ public virtual Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3
408408
IDbTransaction transaction = null)
409409
{
410410
var sqlQuery = new SqlGenerator<TEntity>().GetSelectAll(predicate, tChild1, tChild2, tChild3, tChild4, tChild5);
411-
return ExecuteJoinQueryAsync<TChild1, TChild2, TChild3, DontMap, DontMap, DontMap>(sqlQuery, transaction, tChild1, tChild2, tChild3, tChild4, tChild5);
411+
return ExecuteJoinQueryAsync<TChild1, TChild2, TChild3, TChild4, TChild5, DontMap>(sqlQuery, transaction, tChild1, tChild2, tChild3, tChild4, tChild5);
412412
}
413413

414414
/// <inheritdoc />
415-
public virtual Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3>(
415+
public virtual Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3, TChild4, TChild5, TChild6>(
416416
Expression<Func<TEntity, bool>> predicate,
417417
Expression<Func<TEntity, object>> tChild1,
418418
Expression<Func<TEntity, object>> tChild2,
@@ -423,7 +423,7 @@ public virtual Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3
423423
IDbTransaction transaction = null)
424424
{
425425
var sqlQuery = new SqlGenerator<TEntity>().GetSelectAll(predicate, tChild1, tChild2, tChild3, tChild4, tChild5, tChild6);
426-
return ExecuteJoinQueryAsync<TChild1, TChild2, TChild3, DontMap, DontMap, DontMap>(sqlQuery, transaction, tChild1, tChild2, tChild3, tChild4, tChild5, tChild6);
426+
return ExecuteJoinQueryAsync<TChild1, TChild2, TChild3, TChild4, TChild5, TChild6>(sqlQuery, transaction, tChild1, tChild2, tChild3, tChild4, tChild5, tChild6);
427427
}
428428

429429
private IEnumerable<TEntity> ExecuteJoinQuery<TChild1, TChild2, TChild3, TChild4, TChild5, TChild6>(

MicroOrm.Dapper.Repositories/IDapperRepository.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3>(
196196
/// <summary>
197197
/// Get all objects with join objects
198198
/// </summary>
199-
IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3>(
199+
IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3, TChild4>(
200200
Expression<Func<TEntity, bool>> predicate,
201201
Expression<Func<TEntity, object>> tChild1,
202202
Expression<Func<TEntity, object>> tChild2,
@@ -207,7 +207,7 @@ IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3>(
207207
/// <summary>
208208
/// Get all objects with join objects
209209
/// </summary>
210-
IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3>(
210+
IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3, TChild4, TChild5>(
211211
Expression<Func<TEntity, bool>> predicate,
212212
Expression<Func<TEntity, object>> tChild1,
213213
Expression<Func<TEntity, object>> tChild2,
@@ -219,7 +219,7 @@ IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3>(
219219
/// <summary>
220220
/// Get all objects with join objects
221221
/// </summary>
222-
IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3>(
222+
IEnumerable<TEntity> FindAll<TChild1, TChild2, TChild3, TChild4, TChild5, TChild6>(
223223
Expression<Func<TEntity, bool>> predicate,
224224
Expression<Func<TEntity, object>> tChild1,
225225
Expression<Func<TEntity, object>> tChild2,
@@ -270,7 +270,7 @@ Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3>(
270270
/// <summary>
271271
/// Get all objects with join objects
272272
/// </summary>
273-
Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3>(
273+
Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3, TChild4>(
274274
Expression<Func<TEntity, bool>> predicate,
275275
Expression<Func<TEntity, object>> tChild1,
276276
Expression<Func<TEntity, object>> tChild2,
@@ -281,7 +281,7 @@ Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3>(
281281
/// <summary>
282282
/// Get all objects with join objects
283283
/// </summary>
284-
Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3>(
284+
Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3, TChild4, TChild5>(
285285
Expression<Func<TEntity, bool>> predicate,
286286
Expression<Func<TEntity, object>> tChild1,
287287
Expression<Func<TEntity, object>> tChild2,
@@ -293,7 +293,7 @@ Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3>(
293293
/// <summary>
294294
/// Get all objects with join objects
295295
/// </summary>
296-
Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3>(
296+
Task<IEnumerable<TEntity>> FindAllAsync<TChild1, TChild2, TChild3, TChild4, TChild5, TChild6>(
297297
Expression<Func<TEntity, bool>> predicate,
298298
Expression<Func<TEntity, object>> tChild1,
299299
Expression<Func<TEntity, object>> tChild2,

0 commit comments

Comments
 (0)