Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 779d19e

Browse files
mythzmythz
authored
Merge pull request #564 from shift-evgeny/fix_default_values_in_dialect_providers
Fix the default value of the "token" parameter in Async methods
2 parents d6be92a + 1f8c1f4 commit 779d19e

File tree

3 files changed

+29
-24
lines changed

3 files changed

+29
-24
lines changed

‎src/ServiceStack.OrmLite.MySql/MySqlDialectProvider.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -224,32 +224,32 @@ protected MySqlDataReader Unwrap(IDataReader reader)
224224
}
225225

226226
#if ASYNC
227-
public override Task OpenAsync(IDbConnection db, CancellationToken token)
227+
public override Task OpenAsync(IDbConnection db, CancellationToken token = default(CancellationToken))
228228
{
229229
return Unwrap(db).OpenAsync(token);
230230
}
231231

232-
public override Task<IDataReader> ExecuteReaderAsync(IDbCommand cmd, CancellationToken token)
232+
public override Task<IDataReader> ExecuteReaderAsync(IDbCommand cmd, CancellationToken token = default(CancellationToken))
233233
{
234234
return Unwrap(cmd).ExecuteReaderAsync(token).Then(x => (IDataReader)x);
235235
}
236236

237-
public override Task<int> ExecuteNonQueryAsync(IDbCommand cmd, CancellationToken token)
237+
public override Task<int> ExecuteNonQueryAsync(IDbCommand cmd, CancellationToken token = default(CancellationToken))
238238
{
239239
return Unwrap(cmd).ExecuteNonQueryAsync(token);
240240
}
241241

242-
public override Task<object> ExecuteScalarAsync(IDbCommand cmd, CancellationToken token)
242+
public override Task<object> ExecuteScalarAsync(IDbCommand cmd, CancellationToken token = default(CancellationToken))
243243
{
244244
return Unwrap(cmd).ExecuteScalarAsync(token);
245245
}
246246

247-
public override Task<bool> ReadAsync(IDataReader reader, CancellationToken token)
247+
public override Task<bool> ReadAsync(IDataReader reader, CancellationToken token = default(CancellationToken))
248248
{
249249
return Unwrap(reader).ReadAsync(token);
250250
}
251251

252-
public override async Task<List<T>> ReaderEach<T>(IDataReader reader, Func<T> fn, CancellationToken token)
252+
public override async Task<List<T>> ReaderEach<T>(IDataReader reader, Func<T> fn, CancellationToken token = default(CancellationToken))
253253
{
254254
try
255255
{
@@ -267,7 +267,7 @@ public override async Task<List<T>> ReaderEach<T>(IDataReader reader, Func<T> fn
267267
}
268268
}
269269

270-
public override async Task<Return> ReaderEach<Return>(IDataReader reader, Action fn, Return source, CancellationToken token)
270+
public override async Task<Return> ReaderEach<Return>(IDataReader reader, Action fn, Return source, CancellationToken token = default(CancellationToken))
271271
{
272272
try
273273
{
@@ -283,7 +283,7 @@ public override async Task<Return> ReaderEach<Return>(IDataReader reader, Action
283283
}
284284
}
285285

286-
public override async Task<T> ReaderRead<T>(IDataReader reader, Func<T> fn, CancellationToken token)
286+
public override async Task<T> ReaderRead<T>(IDataReader reader, Func<T> fn, CancellationToken token = default(CancellationToken))
287287
{
288288
try
289289
{

‎src/ServiceStack.OrmLite.PostgreSQL/PostgreSQLDialectProvider.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -339,32 +339,32 @@ protected NpgsqlDataReader Unwrap(IDataReader reader)
339339
}
340340

341341
#if ASYNC
342-
public override Task OpenAsync(IDbConnection db, CancellationToken token)
342+
public override Task OpenAsync(IDbConnection db, CancellationToken token = default(CancellationToken))
343343
{
344344
return Unwrap(db).OpenAsync(token);
345345
}
346346

347-
public override Task<IDataReader> ExecuteReaderAsync(IDbCommand cmd, CancellationToken token)
347+
public override Task<IDataReader> ExecuteReaderAsync(IDbCommand cmd, CancellationToken token = default(CancellationToken))
348348
{
349349
return Unwrap(cmd).ExecuteReaderAsync(token).Then(x => (IDataReader)x);
350350
}
351351

352-
public override Task<int> ExecuteNonQueryAsync(IDbCommand cmd, CancellationToken token)
352+
public override Task<int> ExecuteNonQueryAsync(IDbCommand cmd, CancellationToken token = default(CancellationToken))
353353
{
354354
return Unwrap(cmd).ExecuteNonQueryAsync(token);
355355
}
356356

357-
public override Task<object> ExecuteScalarAsync(IDbCommand cmd, CancellationToken token)
357+
public override Task<object> ExecuteScalarAsync(IDbCommand cmd, CancellationToken token = default(CancellationToken))
358358
{
359359
return Unwrap(cmd).ExecuteScalarAsync(token);
360360
}
361361

362-
public override Task<bool> ReadAsync(IDataReader reader, CancellationToken token)
362+
public override Task<bool> ReadAsync(IDataReader reader, CancellationToken token = default(CancellationToken))
363363
{
364364
return Unwrap(reader).ReadAsync(token);
365365
}
366366

367-
public override async Task<List<T>> ReaderEach<T>(IDataReader reader, Func<T> fn, CancellationToken token)
367+
public override async Task<List<T>> ReaderEach<T>(IDataReader reader, Func<T> fn, CancellationToken token = default(CancellationToken))
368368
{
369369
try
370370
{
@@ -382,7 +382,7 @@ public override async Task<List<T>> ReaderEach<T>(IDataReader reader, Func<T> fn
382382
}
383383
}
384384

385-
public override async Task<Return> ReaderEach<Return>(IDataReader reader, Action fn, Return source, CancellationToken token)
385+
public override async Task<Return> ReaderEach<Return>(IDataReader reader, Action fn, Return source, CancellationToken token = default(CancellationToken))
386386
{
387387
try
388388
{
@@ -398,7 +398,7 @@ public override async Task<Return> ReaderEach<Return>(IDataReader reader, Action
398398
}
399399
}
400400

401-
public override async Task<T> ReaderRead<T>(IDataReader reader, Func<T> fn, CancellationToken token)
401+
public override async Task<T> ReaderRead<T>(IDataReader reader, Func<T> fn, CancellationToken token = default(CancellationToken))
402402
{
403403
try
404404
{

‎src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -362,17 +362,22 @@ public override string GetLoadChildrenSubSelect<From>(SqlExpression<From> expr)
362362
protected SqlDataReader Unwrap(IDataReader reader) => (SqlDataReader)reader;
363363

364364
#if ASYNC
365-
public override Task OpenAsync(IDbConnection db, CancellationToken token) => Unwrap(db).OpenAsync(token);
365+
public override Task OpenAsync(IDbConnection db, CancellationToken token = default(CancellationToken))
366+
=> Unwrap(db).OpenAsync(token);
366367

367-
public override Task<IDataReader> ExecuteReaderAsync(IDbCommand cmd, CancellationToken token) => Unwrap(cmd).ExecuteReaderAsync(token).Then(x => (IDataReader)x);
368+
public override Task<IDataReader> ExecuteReaderAsync(IDbCommand cmd, CancellationToken token = default(CancellationToken))
369+
=> Unwrap(cmd).ExecuteReaderAsync(token).Then(x => (IDataReader)x);
368370

369-
public override Task<int> ExecuteNonQueryAsync(IDbCommand cmd, CancellationToken token) => Unwrap(cmd).ExecuteNonQueryAsync(token);
371+
public override Task<int> ExecuteNonQueryAsync(IDbCommand cmd, CancellationToken token = default(CancellationToken))
372+
=> Unwrap(cmd).ExecuteNonQueryAsync(token);
370373

371-
public override Task<object> ExecuteScalarAsync(IDbCommand cmd, CancellationToken token) => Unwrap(cmd).ExecuteScalarAsync(token);
374+
public override Task<object> ExecuteScalarAsync(IDbCommand cmd, CancellationToken token = default(CancellationToken))
375+
=> Unwrap(cmd).ExecuteScalarAsync(token);
372376

373-
public override Task<bool> ReadAsync(IDataReader reader, CancellationToken token) => Unwrap(reader).ReadAsync(token);
377+
public override Task<bool> ReadAsync(IDataReader reader, CancellationToken token = default(CancellationToken))
378+
=> Unwrap(reader).ReadAsync(token);
374379

375-
public override async Task<List<T>> ReaderEach<T>(IDataReader reader, Func<T> fn, CancellationToken token)
380+
public override async Task<List<T>> ReaderEach<T>(IDataReader reader, Func<T> fn, CancellationToken token = default(CancellationToken))
376381
{
377382
try
378383
{
@@ -390,7 +395,7 @@ public override async Task<List<T>> ReaderEach<T>(IDataReader reader, Func<T> fn
390395
}
391396
}
392397

393-
public override async Task<Return> ReaderEach<Return>(IDataReader reader, Action fn, Return source, CancellationToken token)
398+
public override async Task<Return> ReaderEach<Return>(IDataReader reader, Action fn, Return source, CancellationToken token = default(CancellationToken))
394399
{
395400
try
396401
{
@@ -406,7 +411,7 @@ public override async Task<Return> ReaderEach<Return>(IDataReader reader, Action
406411
}
407412
}
408413

409-
public override async Task<T> ReaderRead<T>(IDataReader reader, Func<T> fn, CancellationToken token)
414+
public override async Task<T> ReaderRead<T>(IDataReader reader, Func<T> fn, CancellationToken token = default(CancellationToken))
410415
{
411416
try
412417
{

0 commit comments

Comments
 (0)