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

Commit 80459c3

Browse files
committed
Remove separate .Async namespace
1 parent dc48a3f commit 80459c3

19 files changed

+17
-33
lines changed

src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
using System.Threading;
99
using System.Threading.Tasks;
1010
using ServiceStack.Data;
11-
using ServiceStack.OrmLite.Async;
12-
using ServiceStack.Text;
13-
using ServiceStack;
1411

1512
namespace ServiceStack.OrmLite.SqlServer
1613
{

src/ServiceStack.OrmLite/Async/OrmLiteReadCommandExtensionsAsync.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
using ServiceStack.Logging;
1111
using ServiceStack.OrmLite.Support;
1212

13-
namespace ServiceStack.OrmLite.Async
13+
namespace ServiceStack.OrmLite
1414
{
15-
public static class OrmLiteReadCommandExtensionsAsync
15+
internal static class OrmLiteReadCommandExtensionsAsync
1616
{
1717
private static readonly ILog Log = LogManager.GetLogger(typeof(OrmLiteReadCommandExtensionsAsync));
1818

src/ServiceStack.OrmLite/Async/OrmLiteResultsFilterExtensionsAsync.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
using System.Threading;
99
using System.Threading.Tasks;
1010

11-
namespace ServiceStack.OrmLite.Async
11+
namespace ServiceStack.OrmLite
1212
{
13-
public static class OrmLiteResultsFilterExtensionsAsync
13+
internal static class OrmLiteResultsFilterExtensionsAsync
1414
{
1515
internal static Task<int> ExecNonQueryAsync(this IDbCommand dbCmd, string sql, object anonType, CancellationToken token)
1616
{

src/ServiceStack.OrmLite/Async/OrmLiteUtilExtensionsAsync.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
using System.Threading;
99
using System.Threading.Tasks;
1010

11-
namespace ServiceStack.OrmLite.Async
11+
namespace ServiceStack.OrmLite
1212
{
13-
public static class OrmLiteUtilExtensionsAsync
13+
internal static class OrmLiteUtilExtensionsAsync
1414
{
1515
public static T CreateInstance<T>()
1616
{

src/ServiceStack.OrmLite/Async/OrmLiteWriteCommandExtensionsAsync.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
using ServiceStack.Data;
1212
using ServiceStack.Logging;
1313

14-
namespace ServiceStack.OrmLite.Async
14+
namespace ServiceStack.OrmLite
1515
{
16-
public static class OrmLiteWriteCommandExtensionsAsync
16+
internal static class OrmLiteWriteCommandExtensionsAsync
1717
{
1818
private static readonly ILog Log = LogManager.GetLogger(typeof(OrmLiteWriteCommandExtensionsAsync));
1919

src/ServiceStack.OrmLite/Async/ReadExpressionCommandExtensionsAsync.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
using System.Threading;
1010
using System.Threading.Tasks;
1111

12-
namespace ServiceStack.OrmLite.Async
12+
namespace ServiceStack.OrmLite
1313
{
14-
public static class ReadExpressionCommandExtensionsAsync
14+
internal static class ReadExpressionCommandExtensionsAsync
1515
{
1616
internal static Task<List<T>> SelectAsync<T>(this IDbCommand dbCmd, Func<SqlExpression<T>, SqlExpression<T>> expression, CancellationToken token)
1717
{
@@ -132,23 +132,23 @@ internal static Task<long> RowCountAsync(this IDbCommand dbCmd, string sql, Canc
132132
{
133133
var expr = OrmLiteConfig.DialectProvider.SqlExpression<T>();
134134
expr = expression(expr);
135-
return dbCmd.LoadListWithReferences<T, T>(expr);
135+
return dbCmd.LoadListWithReferences<T, T>(expr, token);
136136
}
137137

138138
internal static Task<List<T>> LoadSelectAsync<T>(this IDbCommand dbCmd, SqlExpression<T> expression = null, CancellationToken token = default(CancellationToken))
139139
{
140-
return dbCmd.LoadListWithReferences<T, T>(expression);
140+
return dbCmd.LoadListWithReferences<T, T>(expression, token);
141141
}
142142

143143
internal static Task<List<Into>> LoadSelectAsync<Into, From>(this IDbCommand dbCmd, SqlExpression<From> expression, CancellationToken token = default(CancellationToken))
144144
{
145-
return dbCmd.LoadListWithReferences<Into, From>(expression);
145+
return dbCmd.LoadListWithReferences<Into, From>(expression, token);
146146
}
147147

148148
internal static Task<List<T>> LoadSelectAsync<T>(this IDbCommand dbCmd, Expression<Func<T, bool>> predicate, CancellationToken token = default(CancellationToken))
149149
{
150150
var expr = OrmLiteConfig.DialectProvider.SqlExpression<T>().Where(predicate);
151-
return dbCmd.LoadListWithReferences<T, T>(expr);
151+
return dbCmd.LoadListWithReferences<T, T>(expr, token);
152152
}
153153

154154
internal static Task<T> ExprConvertToAsync<T>(this IDataReader dataReader, CancellationToken token)

src/ServiceStack.OrmLite/Async/WriteExpressionCommandExtensionsAsync.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
using System;
22
using System.Data;
3-
using System.Linq;
43
using System.Linq.Expressions;
5-
using System.Text;
64
using System.Threading;
75
using System.Threading.Tasks;
86

9-
namespace ServiceStack.OrmLite.Async
7+
namespace ServiceStack.OrmLite
108
{
119
internal static class WriteExpressionCommandExtensionsAsync
1210
{

src/ServiceStack.OrmLite/Expressions/ReadExpressionCommandExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace ServiceStack.OrmLite
99
{
10-
public static class ReadExpressionCommandExtensions
10+
internal static class ReadExpressionCommandExtensions
1111
{
1212
public static SqlExpression<T> SqlExpression<T>()
1313
{

src/ServiceStack.OrmLite/Expressions/WriteExpressionCommandExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace ServiceStack.OrmLite
99
{
10-
public static class WriteExpressionCommandExtensions
10+
internal static class WriteExpressionCommandExtensions
1111
{
1212
public static int UpdateOnly<T>(this IDbCommand dbCmd, T model, Func<SqlExpression<T>, SqlExpression<T>> onlyFields)
1313
{

src/ServiceStack.OrmLite/OrmLiteDialectProviderBase.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
using System.Threading.Tasks;
2020
using ServiceStack.DataAnnotations;
2121
using ServiceStack.Logging;
22-
using ServiceStack.OrmLite.Async;
2322
using ServiceStack.Text;
24-
using System.Diagnostics;
2523
using System.Linq.Expressions;
2624

2725
namespace ServiceStack.OrmLite

0 commit comments

Comments
 (0)