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

Commit be4c493

Browse files
mythzmythz
committed
Add ConfigAwait() to all async/await methods
1 parent 3f98cb2 commit be4c493

12 files changed

Lines changed: 125 additions & 140 deletions

‎src/ServiceStack.OrmLite/Async/OrmLiteReadCommandExtensionsAsync.cs‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using System.Threading.Tasks;
1212
using ServiceStack.Logging;
1313
using ServiceStack.OrmLite.Support;
14+
using ServiceStack.Text;
1415

1516
namespace ServiceStack.OrmLite
1617
{
@@ -215,7 +216,7 @@ internal static Task<T> ScalarAsync<T>(this IDataReader reader, IOrmLiteDialectP
215216

216217
public static async Task<long> LongScalarAsync(this IDbCommand dbCmd, CancellationToken token)
217218
{
218-
var ret = await dbCmd.GetDialectProvider().ExecuteScalarAsync(dbCmd, token);
219+
var ret = await dbCmd.GetDialectProvider().ExecuteScalarAsync(dbCmd, token).ConfigAwait();
219220
return OrmLiteReadCommandExtensions.ToLong(ret);
220221
}
221222

@@ -232,7 +233,7 @@ internal static async Task<List<T>> ColumnAsync<T>(this IDataReader reader, IOrm
232233
{
233234
var value = dialectProvider.FromDbValue(reader, 0, typeof(T));
234235
return value == DBNull.Value ? default(T) : value;
235-
}, token);
236+
}, token).ConfigAwait();
236237

237238
var columnValues = new List<T>();
238239
ret.Each(o => columnValues.Add((T)o));
@@ -252,7 +253,7 @@ internal static async Task<HashSet<T>> ColumnDistinctAsync<T>(this IDataReader r
252253
{
253254
var value = dialectProvider.FromDbValue(reader, 0, typeof(T));
254255
return value == DBNull.Value ? default(T) : value;
255-
}, token);
256+
}, token).ConfigAwait();
256257

257258
var columnValues = new HashSet<T>();
258259
ret.Each(o => columnValues.Add((T)o));
@@ -332,15 +333,15 @@ internal static async Task<bool> ExistsAsync<T>(this IDbCommand dbCmd, object an
332333

333334
sql = dbCmd.GetFilterSql<T>();
334335

335-
var ret = await dbCmd.ScalarAsync(sql, token);
336+
var ret = await dbCmd.ScalarAsync(sql, token).ConfigAwait();
336337
return ret != null;
337338
}
338339

339340
internal static async Task<bool> ExistsAsync<T>(this IDbCommand dbCmd, string sql, object anonType, CancellationToken token)
340341
{
341342
if (anonType != null) dbCmd.SetParameters(anonType.ToObjectDictionary(), (bool)false, sql:ref sql);
342343

343-
var ret = await dbCmd.ScalarAsync(dbCmd.GetDialectProvider().ToSelectStatement(typeof(T), sql), token);
344+
var ret = await dbCmd.ScalarAsync(dbCmd.GetDialectProvider().ToSelectStatement(typeof(T), sql), token).ConfigAwait();
344345
return ret != null;
345346
}
346347

@@ -365,11 +366,11 @@ internal static Task<List<TOutputModel>> SqlProcedureFmtAsync<TOutputModel>(this
365366

366367
internal static async Task<T> LoadSingleByIdAsync<T>(this IDbCommand dbCmd, object value, string[] include = null, CancellationToken token = default)
367368
{
368-
var row = await dbCmd.SingleByIdAsync<T>(value, token);
369+
var row = await dbCmd.SingleByIdAsync<T>(value, token).ConfigAwait();
369370
if (row == null)
370371
return default(T);
371372

372-
await dbCmd.LoadReferencesAsync(row, include, token);
373+
await dbCmd.LoadReferencesAsync(row, include, token).ConfigAwait();
373374

374375
return row;
375376
}
@@ -392,11 +393,11 @@ public static async Task LoadReferencesAsync<T>(this IDbCommand dbCmd, T instanc
392393
var listInterface = fieldDef.FieldType.GetTypeWithGenericInterfaceOf(typeof(IList<>));
393394
if (listInterface != null)
394395
{
395-
await loadRef.SetRefFieldList(fieldDef, listInterface.GetGenericArguments()[0], token);
396+
await loadRef.SetRefFieldList(fieldDef, listInterface.GetGenericArguments()[0], token).ConfigAwait();
396397
}
397398
else
398399
{
399-
await loadRef.SetRefField(fieldDef, fieldDef.FieldType, token);
400+
await loadRef.SetRefField(fieldDef, fieldDef.FieldType, token).ConfigAwait();
400401
}
401402
}
402403
}
@@ -419,11 +420,11 @@ internal static async Task<List<Into>> LoadListWithReferences<Into, From>(this I
419420
var listInterface = fieldDef.FieldType.GetTypeWithGenericInterfaceOf(typeof(IList<>));
420421
if (listInterface != null)
421422
{
422-
await loadList.SetRefFieldListAsync(fieldDef, listInterface.GetGenericArguments()[0], token);
423+
await loadList.SetRefFieldListAsync(fieldDef, listInterface.GetGenericArguments()[0], token).ConfigAwait();
423424
}
424425
else
425426
{
426-
await loadList.SetRefFieldAsync(fieldDef, fieldDef.FieldType, token);
427+
await loadList.SetRefFieldAsync(fieldDef, fieldDef.FieldType, token).ConfigAwait();
427428
}
428429
}
429430

‎src/ServiceStack.OrmLite/Async/OrmLiteResultsFilterExtensionsAsync.cs‎

Lines changed: 27 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
using System.Threading;
1010
using System.Threading.Tasks;
1111
using ServiceStack.Logging;
12+
using ServiceStack.Text;
1213

1314
namespace ServiceStack.OrmLite
1415
{
@@ -79,13 +80,11 @@ public static async Task<List<T>> ConvertToListAsync<T>(this IDbCommand dbCmd, s
7980
return OrmLiteConfig.ResultsFilter.GetList<T>(dbCmd);
8081

8182
var dialectProvider = dbCmd.GetDialectProvider();
82-
using (var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token))
83-
{
84-
if (OrmLiteUtils.IsScalar<T>())
85-
return await reader.ColumnAsync<T>(dialectProvider, token);
83+
using var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token).ConfigAwait();
84+
if (OrmLiteUtils.IsScalar<T>())
85+
return await reader.ColumnAsync<T>(dialectProvider, token).ConfigAwait();
8686

87-
return await reader.ConvertToListAsync<T>(dialectProvider, null, token);
88-
}
87+
return await reader.ConvertToListAsync<T>(dialectProvider, null, token).ConfigAwait();
8988
}
9089

9190
public static Task<IList> ConvertToListAsync(this IDbCommand dbCmd, Type refType)
@@ -102,10 +101,8 @@ public static async Task<IList> ConvertToListAsync(this IDbCommand dbCmd, Type r
102101
return OrmLiteConfig.ResultsFilter.GetRefList(dbCmd, refType);
103102

104103
var dialectProvider = dbCmd.GetDialectProvider();
105-
using (var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token))
106-
{
107-
return await reader.ConvertToListAsync(dialectProvider, refType, token);
108-
}
104+
using var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token).ConfigAwait();
105+
return await reader.ConvertToListAsync(dialectProvider, refType, token).ConfigAwait();
109106
}
110107

111108
internal static async Task<List<T>> ExprConvertToListAsync<T>(this IDbCommand dbCmd, string sql, IEnumerable<IDbDataParameter> sqlParams, HashSet<string> onlyFields, CancellationToken token)
@@ -119,10 +116,8 @@ internal static async Task<List<T>> ExprConvertToListAsync<T>(this IDbCommand db
119116
return OrmLiteConfig.ResultsFilter.GetList<T>(dbCmd);
120117

121118
var dialectProvider = dbCmd.GetDialectProvider();
122-
using (var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token))
123-
{
124-
return await reader.ConvertToListAsync<T>(dialectProvider, onlyFields, token);
125-
}
119+
using var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token).ConfigAwait();
120+
return await reader.ConvertToListAsync<T>(dialectProvider, onlyFields, token).ConfigAwait();
126121
}
127122

128123
public static Task<T> ConvertToAsync<T>(this IDbCommand dbCmd)
@@ -139,10 +134,8 @@ public static async Task<T> ConvertToAsync<T>(this IDbCommand dbCmd, string sql,
139134
return OrmLiteConfig.ResultsFilter.GetSingle<T>(dbCmd);
140135

141136
var dialectProvider = dbCmd.GetDialectProvider();
142-
using (var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token))
143-
{
144-
return await reader.ConvertToAsync<T>(dialectProvider, token);
145-
}
137+
using var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token).ConfigAwait();
138+
return await reader.ConvertToAsync<T>(dialectProvider, token).ConfigAwait();
146139
}
147140

148141
internal static async Task<object> ConvertToAsync(this IDbCommand dbCmd, Type refType, string sql, CancellationToken token)
@@ -154,10 +147,8 @@ internal static async Task<object> ConvertToAsync(this IDbCommand dbCmd, Type re
154147
return OrmLiteConfig.ResultsFilter.GetRefSingle(dbCmd, refType);
155148

156149
var dialectProvider = dbCmd.GetDialectProvider();
157-
using (var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token))
158-
{
159-
return await reader.ConvertToAsync(dialectProvider, refType, token);
160-
}
150+
using var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token).ConfigAwait();
151+
return await reader.ConvertToAsync(dialectProvider, refType, token).ConfigAwait();
161152
}
162153

163154
public static Task<T> ScalarAsync<T>(this IDbCommand dbCmd)
@@ -179,10 +170,8 @@ public static async Task<T> ScalarAsync<T>(this IDbCommand dbCmd, string sql, Ca
179170
return OrmLiteConfig.ResultsFilter.GetScalar<T>(dbCmd);
180171

181172
var dialectProvider = dbCmd.GetDialectProvider();
182-
using (var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token))
183-
{
184-
return await reader.ScalarAsync<T>(dialectProvider, token);
185-
}
173+
using var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token).ConfigAwait();
174+
return await reader.ScalarAsync<T>(dialectProvider, token).ConfigAwait();
186175
}
187176

188177
public static Task<object> ScalarAsync(this IDbCommand dbCmd)
@@ -243,10 +232,8 @@ internal static async Task<T> ExprConvertToAsync<T>(this IDbCommand dbCmd, strin
243232
return OrmLiteConfig.ResultsFilter.GetSingle<T>(dbCmd);
244233

245234
var dialectProvider = dbCmd.GetDialectProvider();
246-
using (var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token))
247-
{
248-
return await reader.ConvertToAsync<T>(dialectProvider, token);
249-
}
235+
using var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token).ConfigAwait();
236+
return await reader.ConvertToAsync<T>(dialectProvider, token).ConfigAwait();
250237
}
251238

252239
internal static Task<List<T>> ColumnAsync<T>(this IDbCommand dbCmd, string sql, IEnumerable<IDbDataParameter> sqlParams, CancellationToken token)
@@ -263,10 +250,8 @@ internal static async Task<List<T>> ColumnAsync<T>(this IDbCommand dbCmd, string
263250
return OrmLiteConfig.ResultsFilter.GetColumn<T>(dbCmd);
264251

265252
var dialectProvider = dbCmd.GetDialectProvider();
266-
using (var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token))
267-
{
268-
return await reader.ColumnAsync<T>(dialectProvider, token);
269-
}
253+
using var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token).ConfigAwait();
254+
return await reader.ColumnAsync<T>(dialectProvider, token).ConfigAwait();
270255
}
271256

272257
internal static Task<HashSet<T>> ColumnDistinctAsync<T>(this IDbCommand dbCmd, string sql, IEnumerable<IDbDataParameter> sqlParams, CancellationToken token)
@@ -283,10 +268,8 @@ internal static async Task<HashSet<T>> ColumnDistinctAsync<T>(this IDbCommand db
283268
return OrmLiteConfig.ResultsFilter.GetColumnDistinct<T>(dbCmd);
284269

285270
var dialectProvider = dbCmd.GetDialectProvider();
286-
using (var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token))
287-
{
288-
return await reader.ColumnDistinctAsync<T>(dialectProvider, token);
289-
}
271+
using var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token).ConfigAwait();
272+
return await reader.ColumnDistinctAsync<T>(dialectProvider, token).ConfigAwait();
290273
}
291274

292275
internal static Task<Dictionary<K, V>> DictionaryAsync<K, V>(this IDbCommand dbCmd, string sql, IEnumerable<IDbDataParameter> sqlParams, CancellationToken token)
@@ -303,10 +286,8 @@ internal static async Task<Dictionary<K, V>> DictionaryAsync<K, V>(this IDbComma
303286
return OrmLiteConfig.ResultsFilter.GetDictionary<K, V>(dbCmd);
304287

305288
var dialectProvider = dbCmd.GetDialectProvider();
306-
using (var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token))
307-
{
308-
return await reader.DictionaryAsync<K, V>(dialectProvider, token);
309-
}
289+
using var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token).ConfigAwait();
290+
return await reader.DictionaryAsync<K, V>(dialectProvider, token).ConfigAwait();
310291
}
311292

312293
internal static Task<List<KeyValuePair<K, V>>> KeyValuePairsAsync<K, V>(this IDbCommand dbCmd, string sql, IEnumerable<IDbDataParameter> sqlParams, CancellationToken token)
@@ -323,10 +304,8 @@ internal static async Task<List<KeyValuePair<K, V>>> KeyValuePairsAsync<K, V>(th
323304
return OrmLiteConfig.ResultsFilter.GetKeyValuePairs<K, V>(dbCmd);
324305

325306
var dialectProvider = dbCmd.GetDialectProvider();
326-
using (var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token))
327-
{
328-
return await reader.KeyValuePairsAsync<K, V>(dialectProvider, token);
329-
}
307+
using var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token).ConfigAwait();
308+
return await reader.KeyValuePairsAsync<K, V>(dialectProvider, token).ConfigAwait();
330309
}
331310

332311
internal static Task<Dictionary<K, List<V>>> LookupAsync<K, V>(this IDbCommand dbCmd, string sql, IEnumerable<IDbDataParameter> sqlParams, CancellationToken token)
@@ -343,10 +322,8 @@ internal static async Task<Dictionary<K, List<V>>> LookupAsync<K, V>(this IDbCom
343322
return OrmLiteConfig.ResultsFilter.GetLookup<K, V>(dbCmd);
344323

345324
var dialectProvider = dbCmd.GetDialectProvider();
346-
using (var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token))
347-
{
348-
return await reader.LookupAsync<K, V>(dialectProvider, token);
349-
}
325+
using var reader = await dbCmd.ExecReaderAsync(dbCmd.CommandText, token).ConfigAwait();
326+
return await reader.LookupAsync<K, V>(dialectProvider, token).ConfigAwait();
350327
}
351328
}
352329
}

‎src/ServiceStack.OrmLite/Async/OrmLiteUtilExtensionsAsync.cs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using System.Linq;
1111
using System.Threading;
1212
using System.Threading.Tasks;
13+
using ServiceStack.Text;
1314

1415
namespace ServiceStack.OrmLite
1516
{
@@ -40,7 +41,7 @@ public static async Task<T> ConvertToAsync<T>(this IDataReader reader, IOrmLiteD
4041
var indexCache = reader.GetIndexFieldsCache(ModelDefinition<T>.Definition, dialectProvider);
4142
row.PopulateWithSqlReader(dialectProvider, reader, indexCache, values);
4243
return row;
43-
}, token);
44+
}, token).ConfigAwait();
4445
}
4546

4647
public static async Task<List<T>> ConvertToListAsync<T>(this IDataReader reader, IOrmLiteDialectProvider dialectProvider, HashSet<string> onlyFields, CancellationToken token)
@@ -53,7 +54,7 @@ public static async Task<List<T>> ConvertToListAsync<T>(this IDataReader reader,
5354
{
5455
var row = reader.ConvertToListObjects();
5556
return (T) (object) row;
56-
}, token);
57+
}, token).ConfigAwait();
5758
}
5859
}
5960
if (typeof(T) == typeof(Dictionary<string, object>))
@@ -64,7 +65,7 @@ public static async Task<List<T>> ConvertToListAsync<T>(this IDataReader reader,
6465
{
6566
var row = reader.ConvertToDictionaryObjects();
6667
return (T) (object) row;
67-
}, token);
68+
}, token).ConfigAwait();
6869
}
6970
}
7071
if (typeof(T) == typeof(object))
@@ -75,7 +76,7 @@ public static async Task<List<T>> ConvertToListAsync<T>(this IDataReader reader,
7576
{
7677
var row = reader.ConvertToExpandoObject();
7778
return (T) (object) row;
78-
}, token);
79+
}, token).ConfigAwait();
7980
}
8081
}
8182
if (typeof(T).IsValueTuple())
@@ -87,7 +88,7 @@ public static async Task<List<T>> ConvertToListAsync<T>(this IDataReader reader,
8788
{
8889
var row = reader.ConvertToValueTuple<T>(values, dialectProvider);
8990
return row;
90-
}, token);
91+
}, token).ConfigAwait();
9192
}
9293
}
9394
if (typeof(T).IsTuple())
@@ -106,7 +107,7 @@ public static async Task<List<T>> ConvertToListAsync<T>(this IDataReader reader,
106107
var tupleArgs = reader.ToMultiTuple(dialectProvider, modelIndexCaches, genericArgs, values);
107108
var tuple = activator(tupleArgs.ToArray());
108109
return (T) tuple;
109-
}, token);
110+
}, token).ConfigAwait();
110111
}
111112
}
112113
else
@@ -121,7 +122,7 @@ public static async Task<List<T>> ConvertToListAsync<T>(this IDataReader reader,
121122
var row = CreateInstance<T>();
122123
row.PopulateWithSqlReader(dialectProvider, reader, indexCache, values);
123124
return row;
124-
}, token);
125+
}, token).ConfigAwait();
125126
}
126127
}
127128
}
@@ -138,7 +139,7 @@ public static async Task<object> ConvertToAsync(this IDataReader reader, IOrmLit
138139
var row = type.CreateInstance();
139140
row.PopulateWithSqlReader(dialectProvider, reader, indexCache, values);
140141
return row;
141-
}, token);
142+
}, token).ConfigAwait();
142143
}
143144

144145
public static async Task<IList> ConvertToListAsync(this IDataReader reader, IOrmLiteDialectProvider dialectProvider, Type type, CancellationToken token)
@@ -154,7 +155,7 @@ public static async Task<IList> ConvertToListAsync(this IDataReader reader, IOrm
154155
var row = type.CreateInstance();
155156
row.PopulateWithSqlReader(dialectProvider, reader, indexCache, values);
156157
return row;
157-
}, token);
158+
}, token).ConfigAwait();
158159

159160
var to = (IList)typeof(List<>).GetCachedGenericType(type).CreateInstance();
160161
ret.Each(o => to.Add(o));

0 commit comments

Comments
 (0)