Skip to content

Commit 5c89d8e

Browse files
phongnguyendphongnguyend
committed
ConnectionContext
1 parent 74621a5 commit 5c89d8e

18 files changed

+106
-136
lines changed

‎src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkDelete/BulkDeleteBuilder.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ public class BulkDeleteBuilder<T>
1717
private readonly SqlConnection _connection;
1818
private readonly SqlTransaction _transaction;
1919

20-
public BulkDeleteBuilder(SqlConnection connection)
21-
{
22-
_connection = connection;
23-
}
24-
2520
public BulkDeleteBuilder(SqlConnection connection, SqlTransaction transaction)
2621
{
2722
_connection = connection;

‎src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkDelete/SqlConnectionAsyncExtensions.cs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,59 +13,59 @@ public static Task<BulkDeleteResult> BulkDeleteAsync<T>(this ConnectionContext c
1313
{
1414
var table = TableMapper.Resolve(typeof(T));
1515

16-
return new BulkDeleteBuilder<T>(connectionContext.Connection)
17-
.WithId(idSelector)
18-
.ToTable(table)
19-
.ConfigureBulkOptions(configureOptions)
20-
.ExecuteAsync(data, cancellationToken);
16+
return new BulkDeleteBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
17+
.WithId(idSelector)
18+
.ToTable(table)
19+
.ConfigureBulkOptions(configureOptions)
20+
.ExecuteAsync(data, cancellationToken);
2121
}
2222

2323
public static Task<BulkDeleteResult> BulkDeleteAsync<T>(this ConnectionContext connectionContext, IEnumerable<T> data, string idColumn, Action<BulkDeleteOptions> configureOptions = null, CancellationToken cancellationToken = default)
2424
{
2525
var table = TableMapper.Resolve(typeof(T));
2626

27-
return new BulkDeleteBuilder<T>(connectionContext.Connection)
28-
.WithId(idColumn)
29-
.ToTable(table)
30-
.ConfigureBulkOptions(configureOptions)
27+
return new BulkDeleteBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
28+
.WithId(idColumn)
29+
.ToTable(table)
30+
.ConfigureBulkOptions(configureOptions)
3131
.ExecuteAsync(data, cancellationToken);
3232
}
3333

3434
public static Task<BulkDeleteResult> BulkDeleteAsync<T>(this ConnectionContext connectionContext, IEnumerable<T> data, IEnumerable<string> idColumns, Action<BulkDeleteOptions> configureOptions = null, CancellationToken cancellationToken = default)
3535
{
3636
var table = TableMapper.Resolve(typeof(T));
3737

38-
return new BulkDeleteBuilder<T>(connectionContext.Connection)
39-
.WithId(idColumns)
40-
.ToTable(table)
41-
.ConfigureBulkOptions(configureOptions)
38+
return new BulkDeleteBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
39+
.WithId(idColumns)
40+
.ToTable(table)
41+
.ConfigureBulkOptions(configureOptions)
4242
.ExecuteAsync(data, cancellationToken);
43-
}
43+
}
4444

4545
public static Task<BulkDeleteResult> BulkDeleteAsync<T>(this ConnectionContext connectionContext, IEnumerable<T> data, TableInfor table, Expression<Func<T, object>> idSelector, Action<BulkDeleteOptions> configureOptions = null, CancellationToken cancellationToken = default)
4646
{
47-
return new BulkDeleteBuilder<T>(connectionContext.Connection)
47+
return new BulkDeleteBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
4848
.WithId(idSelector)
49-
.ToTable(table)
49+
.ToTable(table)
5050
.ConfigureBulkOptions(configureOptions)
51-
.ExecuteAsync(data, cancellationToken);
51+
.ExecuteAsync(data, cancellationToken);
5252
}
5353

5454
public static Task<BulkDeleteResult> BulkDeleteAsync<T>(this ConnectionContext connectionContext, IEnumerable<T> data, TableInfor table, string idColumn, Action<BulkDeleteOptions> configureOptions = null, CancellationToken cancellationToken = default)
5555
{
56-
return new BulkDeleteBuilder<T>(connectionContext.Connection)
57-
.WithId(idColumn)
56+
return new BulkDeleteBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
57+
.WithId(idColumn)
5858
.ToTable(table)
59-
.ConfigureBulkOptions(configureOptions)
60-
.ExecuteAsync(data, cancellationToken);
59+
.ConfigureBulkOptions(configureOptions)
60+
.ExecuteAsync(data, cancellationToken);
6161
}
6262

63-
public static Task<BulkDeleteResult> BulkDeleteAsync<T>(this ConnectionContext connectionContext, IEnumerable<T> data, TableInfor table, IEnumerable<string> idColumns, Action<BulkDeleteOptions> configureOptions = null, CancellationToken cancellationToken = default)
63+
public static Task<BulkDeleteResult> BulkDeleteAsync<T>(this ConnectionContext connectionContext, IEnumerable<T> data, TableInfor table, IEnumerable<string> idColumns, Action<BulkDeleteOptions> configureOptions = null, CancellationToken cancellationToken = default)
6464
{
65-
return new BulkDeleteBuilder<T>(connectionContext.Connection)
66-
.WithId(idColumns)
67-
.ToTable(table)
68-
.ConfigureBulkOptions(configureOptions)
65+
return new BulkDeleteBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
66+
.WithId(idColumns)
67+
.ToTable(table)
68+
.ConfigureBulkOptions(configureOptions)
6969
.ExecuteAsync(data, cancellationToken);
7070
}
7171
}

‎src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkDelete/SqlConnectionExtensions.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public static BulkDeleteResult BulkDelete<T>(this ConnectionContext connectionCo
1111
{
1212
var table = TableMapper.Resolve(typeof(T));
1313

14-
return new BulkDeleteBuilder<T>(connectionContext.Connection)
14+
return new BulkDeleteBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
1515
.WithId(idSelector)
1616
.ToTable(table)
1717
.ConfigureBulkOptions(configureOptions)
@@ -22,48 +22,48 @@ public static BulkDeleteResult BulkDelete<T>(this ConnectionContext connectionCo
2222
{
2323
var table = TableMapper.Resolve(typeof(T));
2424

25-
return new BulkDeleteBuilder<T>(connectionContext.Connection)
26-
.WithId(idColumn)
27-
.ToTable(table)
28-
.ConfigureBulkOptions(configureOptions)
25+
return new BulkDeleteBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
26+
.WithId(idColumn)
27+
.ToTable(table)
28+
.ConfigureBulkOptions(configureOptions)
2929
.Execute(data);
3030
}
3131

3232
public static BulkDeleteResult BulkDelete<T>(this ConnectionContext connectionContext, IEnumerable<T> data, IEnumerable<string> idColumns, Action<BulkDeleteOptions> configureOptions = null)
3333
{
34-
var table = TableMapper.Resolve(typeof(T));
34+
var table = TableMapper.Resolve(typeof(T));
3535

36-
return new BulkDeleteBuilder<T>(connectionContext.Connection)
36+
return new BulkDeleteBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
3737
.WithId(idColumns)
3838
.ToTable(table)
39-
.ConfigureBulkOptions(configureOptions)
39+
.ConfigureBulkOptions(configureOptions)
4040
.Execute(data);
4141
}
4242

4343
public static BulkDeleteResult BulkDelete<T>(this ConnectionContext connectionContext, IEnumerable<T> data, TableInfor table, Expression<Func<T, object>> idSelector, Action<BulkDeleteOptions> configureOptions = null)
4444
{
45-
return new BulkDeleteBuilder<T>(connectionContext.Connection)
45+
return new BulkDeleteBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
4646
.WithId(idSelector)
4747
.ToTable(table)
48-
.ConfigureBulkOptions(configureOptions)
48+
.ConfigureBulkOptions(configureOptions)
4949
.Execute(data);
5050
}
5151

5252
public static BulkDeleteResult BulkDelete<T>(this ConnectionContext connectionContext, IEnumerable<T> data, TableInfor table, string idColumn, Action<BulkDeleteOptions> configureOptions = null)
5353
{
54-
return new BulkDeleteBuilder<T>(connectionContext.Connection)
54+
return new BulkDeleteBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
5555
.WithId(idColumn)
5656
.ToTable(table)
5757
.ConfigureBulkOptions(configureOptions)
5858
.Execute(data);
5959
}
6060

6161
public static BulkDeleteResult BulkDelete<T>(this ConnectionContext connectionContext, IEnumerable<T> data, TableInfor table, IEnumerable<string> idColumns, Action<BulkDeleteOptions> configureOptions = null)
62-
{
63-
return new BulkDeleteBuilder<T>(connectionContext.Connection)
64-
.WithId(idColumns)
65-
.ToTable(table)
66-
.ConfigureBulkOptions(configureOptions)
62+
{
63+
return new BulkDeleteBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
64+
.WithId(idColumns)
65+
.ToTable(table)
66+
.ConfigureBulkOptions(configureOptions)
6767
.Execute(data);
6868
}
6969
}

‎src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkInsert/BulkInsertBuilder.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ public class BulkInsertBuilder<T>
2222
private readonly SqlConnection _connection;
2323
private readonly SqlTransaction _transaction;
2424

25-
public BulkInsertBuilder(SqlConnection connection)
26-
{
27-
_connection = connection;
28-
}
29-
3025
public BulkInsertBuilder(SqlConnection connection, SqlTransaction transaction)
3126
{
3227
_connection = connection;

‎src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkInsert/SqlConnectionAsyncExtensions.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public static Task BulkInsertAsync<T>(this ConnectionContext connectionContext,
1313
{
1414
var table = TableMapper.Resolve(typeof(T));
1515

16-
return new BulkInsertBuilder<T>(connectionContext.Connection)
16+
return new BulkInsertBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
1717
.WithColumns(columnNamesSelector)
1818
.ToTable(table)
1919
.ConfigureBulkOptions(configureOptions)
@@ -24,7 +24,7 @@ public static Task BulkInsertAsync<T>(this ConnectionContext connectionContext,
2424
{
2525
var table = TableMapper.Resolve(typeof(T));
2626

27-
return new BulkInsertBuilder<T>(connectionContext.Connection)
27+
return new BulkInsertBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
2828
.WithColumns(columnNamesSelector)
2929
.ToTable(table)
3030
.WithOutputId(idSelector)
@@ -36,7 +36,7 @@ public static Task BulkInsertAsync<T>(this ConnectionContext connectionContext,
3636
{
3737
var table = TableMapper.Resolve(typeof(T));
3838

39-
return new BulkInsertBuilder<T>(connectionContext.Connection)
39+
return new BulkInsertBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
4040
.WithColumns(columnNames)
4141
.ToTable(table)
4242
.ConfigureBulkOptions(configureOptions)
@@ -47,7 +47,7 @@ public static Task BulkInsertAsync<T>(this ConnectionContext connectionContext,
4747
{
4848
var table = TableMapper.Resolve(typeof(T));
4949

50-
return new BulkInsertBuilder<T>(connectionContext.Connection)
50+
return new BulkInsertBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
5151
.WithColumns(columnNames)
5252
.ToTable(table)
5353
.WithOutputId(idColumnName)
@@ -57,7 +57,7 @@ public static Task BulkInsertAsync<T>(this ConnectionContext connectionContext,
5757

5858
public static Task BulkInsertAsync<T>(this ConnectionContext connectionContext, IEnumerable<T> data, TableInfor table, Expression<Func<T, object>> columnNamesSelector, Action<BulkInsertOptions> configureOptions = null, CancellationToken cancellationToken = default)
5959
{
60-
return new BulkInsertBuilder<T>(connectionContext.Connection)
60+
return new BulkInsertBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
6161
.WithColumns(columnNamesSelector)
6262
.ToTable(table)
6363
.ConfigureBulkOptions(configureOptions)
@@ -66,7 +66,7 @@ public static Task BulkInsertAsync<T>(this ConnectionContext connectionContext,
6666

6767
public static Task BulkInsertAsync<T>(this ConnectionContext connectionContext, IEnumerable<T> data, TableInfor table, Expression<Func<T, object>> columnNamesSelector, Expression<Func<T, object>> idSelector, Action<BulkInsertOptions> configureOptions = null, CancellationToken cancellationToken = default)
6868
{
69-
return new BulkInsertBuilder<T>(connectionContext.Connection)
69+
return new BulkInsertBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
7070
.WithColumns(columnNamesSelector)
7171
.ToTable(table)
7272
.WithOutputId(idSelector)
@@ -76,7 +76,7 @@ public static Task BulkInsertAsync<T>(this ConnectionContext connectionContext,
7676

7777
public static Task BulkInsertAsync<T>(this ConnectionContext connectionContext, IEnumerable<T> data, TableInfor table, IEnumerable<string> columnNames, Action<BulkInsertOptions> configureOptions = null, CancellationToken cancellationToken = default)
7878
{
79-
return new BulkInsertBuilder<T>(connectionContext.Connection)
79+
return new BulkInsertBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
8080
.WithColumns(columnNames)
8181
.ToTable(table)
8282
.ConfigureBulkOptions(configureOptions)
@@ -85,7 +85,7 @@ public static Task BulkInsertAsync<T>(this ConnectionContext connectionContext,
8585

8686
public static Task BulkInsertAsync<T>(this ConnectionContext connectionContext, IEnumerable<T> data, TableInfor table, IEnumerable<string> columnNames, string idColumnName, Action<BulkInsertOptions> configureOptions = null, CancellationToken cancellationToken = default)
8787
{
88-
return new BulkInsertBuilder<T>(connectionContext.Connection)
88+
return new BulkInsertBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
8989
.WithColumns(columnNames)
9090
.ToTable(table)
9191
.WithOutputId(idColumnName)

‎src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkInsert/SqlConnectionExtensions.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public static void BulkInsert<T>(this ConnectionContext connectionContext, IEnum
1111
{
1212
var table = TableMapper.Resolve(typeof(T));
1313

14-
new BulkInsertBuilder<T>(connectionContext.Connection)
14+
new BulkInsertBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
1515
.WithColumns(columnNamesSelector)
1616
.ToTable(table)
1717
.ConfigureBulkOptions(configureOptions)
@@ -22,7 +22,7 @@ public static void BulkInsert<T>(this ConnectionContext connectionContext, IEnum
2222
{
2323
var table = TableMapper.Resolve(typeof(T));
2424

25-
new BulkInsertBuilder<T>(connectionContext.Connection)
25+
new BulkInsertBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
2626
.WithColumns(columnNamesSelector)
2727
.ToTable(table)
2828
.WithOutputId(idSelector)
@@ -34,7 +34,7 @@ public static void BulkInsert<T>(this ConnectionContext connectionContext, IEnum
3434
{
3535
var table = TableMapper.Resolve(typeof(T));
3636

37-
new BulkInsertBuilder<T>(connectionContext.Connection)
37+
new BulkInsertBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
3838
.WithColumns(columnNames)
3939
.ToTable(table)
4040
.ConfigureBulkOptions(configureOptions)
@@ -45,7 +45,7 @@ public static void BulkInsert<T>(this ConnectionContext connectionContext, IEnum
4545
{
4646
var table = TableMapper.Resolve(typeof(T));
4747

48-
new BulkInsertBuilder<T>(connectionContext.Connection)
48+
new BulkInsertBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
4949
.WithColumns(columnNames)
5050
.ToTable(table)
5151
.WithOutputId(idColumnName)
@@ -55,7 +55,7 @@ public static void BulkInsert<T>(this ConnectionContext connectionContext, IEnum
5555

5656
public static void BulkInsert<T>(this ConnectionContext connectionContext, IEnumerable<T> data, TableInfor table, Expression<Func<T, object>> columnNamesSelector, Action<BulkInsertOptions> configureOptions = null)
5757
{
58-
new BulkInsertBuilder<T>(connectionContext.Connection)
58+
new BulkInsertBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
5959
.WithColumns(columnNamesSelector)
6060
.ToTable(table)
6161
.ConfigureBulkOptions(configureOptions)
@@ -64,7 +64,7 @@ public static void BulkInsert<T>(this ConnectionContext connectionContext, IEnum
6464

6565
public static void BulkInsert<T>(this ConnectionContext connectionContext, IEnumerable<T> data, TableInfor table, Expression<Func<T, object>> columnNamesSelector, Expression<Func<T, object>> idSelector, Action<BulkInsertOptions> configureOptions = null)
6666
{
67-
new BulkInsertBuilder<T>(connectionContext.Connection)
67+
new BulkInsertBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
6868
.WithColumns(columnNamesSelector)
6969
.ToTable(table)
7070
.WithOutputId(idSelector)
@@ -74,7 +74,7 @@ public static void BulkInsert<T>(this ConnectionContext connectionContext, IEnum
7474

7575
public static void BulkInsert<T>(this ConnectionContext connectionContext, IEnumerable<T> data, TableInfor table, IEnumerable<string> columnNames, Action<BulkInsertOptions> configureOptions = null)
7676
{
77-
new BulkInsertBuilder<T>(connectionContext.Connection)
77+
new BulkInsertBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
7878
.WithColumns(columnNames)
7979
.ToTable(table)
8080
.ConfigureBulkOptions(configureOptions)
@@ -83,7 +83,7 @@ public static void BulkInsert<T>(this ConnectionContext connectionContext, IEnum
8383

8484
public static void BulkInsert<T>(this ConnectionContext connectionContext, IEnumerable<T> data, TableInfor table, IEnumerable<string> columnNames, string idColumnName, Action<BulkInsertOptions> configureOptions = null)
8585
{
86-
new BulkInsertBuilder<T>(connectionContext.Connection)
86+
new BulkInsertBuilder<T>(connectionContext.Connection, connectionContext.Transaction)
8787
.WithColumns(columnNames)
8888
.ToTable(table)
8989
.WithOutputId(idColumnName)

‎src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkMatch/BulkMatchBuilder.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ public class BulkMatchBuilder<T>
2222
private readonly SqlConnection _connection;
2323
private readonly SqlTransaction _transaction;
2424

25-
public BulkMatchBuilder(SqlConnection connection)
26-
{
27-
_connection = connection;
28-
}
29-
3025
public BulkMatchBuilder(SqlConnection connection, SqlTransaction transaction)
3126
{
3227
_connection = connection;

0 commit comments

Comments
 (0)