Skip to content

Commit 7b28b77

Browse files
phongnguyendphongnguyend
committed
ConnectionContext
1 parent 0405be8 commit 7b28b77

File tree

7 files changed

+22
-22
lines changed

7 files changed

+22
-22
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public BulkDeleteResult Execute(IEnumerable<T> data)
9999

100100
Log($"Begin executing SqlBulkCopy. TableName: {temptableName}");
101101

102-
dataTable.SqlBulkCopy(temptableName, null, _connectionContext.Connection, _connectionContext.Transaction, _options);
102+
dataTable.SqlBulkCopy(temptableName, null, _connectionContext, _options);
103103

104104
Log("End executing SqlBulkCopy.");
105105

@@ -182,7 +182,7 @@ public async Task<BulkDeleteResult> ExecuteAsync(IEnumerable<T> data, Cancellati
182182

183183
Log($"Begin executing SqlBulkCopy. TableName: {temptableName}");
184184

185-
await dataTable.SqlBulkCopyAsync(temptableName, null, _connectionContext.Connection, _connectionContext.Transaction, _options, cancellationToken);
185+
await dataTable.SqlBulkCopyAsync(temptableName, null, _connectionContext, _options, cancellationToken);
186186

187187
Log("End executing SqlBulkCopy.");
188188

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void Execute(IEnumerable<T> data)
121121
_connectionContext.EnsureOpen();
122122

123123
Log($"Begin executing SqlBulkCopy. TableName: {_table.SchemaQualifiedTableName}");
124-
dataTable.SqlBulkCopy(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext.Connection, _connectionContext.Transaction, _options);
124+
dataTable.SqlBulkCopy(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext, _options);
125125
Log("End executing SqlBulkCopy.");
126126
return;
127127
}
@@ -139,7 +139,7 @@ public void Execute(IEnumerable<T> data)
139139
_connectionContext.EnsureOpen();
140140

141141
Log($"Begin executing SqlBulkCopy. TableName: {_table.SchemaQualifiedTableName}");
142-
dataTable.SqlBulkCopy(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext.Connection, _connectionContext.Transaction, _options);
142+
dataTable.SqlBulkCopy(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext, _options);
143143
Log("End executing SqlBulkCopy.");
144144
return;
145145
}
@@ -166,7 +166,7 @@ public void Execute(IEnumerable<T> data)
166166
_connectionContext.EnsureOpen();
167167

168168
Log($"Begin executing SqlBulkCopy. TableName: {_table.SchemaQualifiedTableName}");
169-
dataTable.SqlBulkCopy(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext.Connection, _connectionContext.Transaction, _options);
169+
dataTable.SqlBulkCopy(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext, _options);
170170
Log("End executing SqlBulkCopy.");
171171
return;
172172
}
@@ -198,7 +198,7 @@ public void Execute(IEnumerable<T> data)
198198
Log("End creating temp table.");
199199

200200
Log($"Begin executing SqlBulkCopy. TableName: {temptableName}");
201-
dataTable.SqlBulkCopy(temptableName, null, _connectionContext.Connection, _connectionContext.Transaction, _options);
201+
dataTable.SqlBulkCopy(temptableName, null, _connectionContext, _options);
202202
Log("End executing SqlBulkCopy.");
203203

204204
var returnedIds = new Dictionary<long, object>();
@@ -320,7 +320,7 @@ public async Task ExecuteAsync(IEnumerable<T> data, CancellationToken cancellati
320320
await _connectionContext.EnsureOpenAsync(cancellationToken);
321321

322322
Log($"Begin executing SqlBulkCopy. TableName: {_table.SchemaQualifiedTableName}");
323-
await dataTable.SqlBulkCopyAsync(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext.Connection, _connectionContext.Transaction, _options, cancellationToken);
323+
await dataTable.SqlBulkCopyAsync(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext, _options, cancellationToken);
324324
Log("End executing SqlBulkCopy.");
325325
return;
326326
}
@@ -338,7 +338,7 @@ public async Task ExecuteAsync(IEnumerable<T> data, CancellationToken cancellati
338338
await _connectionContext.EnsureOpenAsync(cancellationToken);
339339

340340
Log($"Begin executing SqlBulkCopy. TableName: {_table.SchemaQualifiedTableName}");
341-
await dataTable.SqlBulkCopyAsync(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext.Connection, _connectionContext.Transaction, _options, cancellationToken);
341+
await dataTable.SqlBulkCopyAsync(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext, _options, cancellationToken);
342342
Log("End executing SqlBulkCopy.");
343343
return;
344344
}
@@ -365,7 +365,7 @@ public async Task ExecuteAsync(IEnumerable<T> data, CancellationToken cancellati
365365
await _connectionContext.EnsureOpenAsync(cancellationToken);
366366

367367
Log($"Begin executing SqlBulkCopy. TableName: {_table.SchemaQualifiedTableName}");
368-
await dataTable.SqlBulkCopyAsync(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext.Connection, _connectionContext.Transaction, _options, cancellationToken);
368+
await dataTable.SqlBulkCopyAsync(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext, _options, cancellationToken);
369369
Log("End executing SqlBulkCopy.");
370370
return;
371371
}
@@ -397,7 +397,7 @@ public async Task ExecuteAsync(IEnumerable<T> data, CancellationToken cancellati
397397
Log("End creating temp table.");
398398

399399
Log($"Begin executing SqlBulkCopy. TableName: {temptableName}");
400-
await dataTable.SqlBulkCopyAsync(temptableName, null, _connectionContext.Connection, _connectionContext.Transaction, _options, cancellationToken);
400+
await dataTable.SqlBulkCopyAsync(temptableName, null, _connectionContext, _options, cancellationToken);
401401
Log("End executing SqlBulkCopy.");
402402

403403
var returnedIds = new Dictionary<long, object>();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public List<T> Execute(IEnumerable<T> machedValues)
115115

116116
Log($"Begin executing SqlBulkCopy. TableName: {temptableName}");
117117

118-
dataTable.SqlBulkCopy(temptableName, null, _connectionContext.Connection, _connectionContext.Transaction, _options);
118+
dataTable.SqlBulkCopy(temptableName, null, _connectionContext, _options);
119119

120120
Log("End executing SqlBulkCopy.");
121121

@@ -190,7 +190,7 @@ public async Task<List<T>> ExecuteAsync(IEnumerable<T> machedValues, Cancellatio
190190

191191
Log($"Begin executing SqlBulkCopy. TableName: {temptableName}");
192192

193-
await dataTable.SqlBulkCopyAsync(temptableName, null, _connectionContext.Connection, _connectionContext.Transaction, _options, cancellationToken);
193+
await dataTable.SqlBulkCopyAsync(temptableName, null, _connectionContext, _options, cancellationToken);
194194

195195
Log("End executing SqlBulkCopy.");
196196

‎src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkMerge/BulkMergeBuilder.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public BulkMergeResult Execute(IEnumerable<T> data)
179179
Log("End creating temp table.");
180180

181181
Log($"Begin executing SqlBulkCopy. TableName: {temptableName}");
182-
dataTable.SqlBulkCopy(temptableName, null, _connectionContext.Connection, _connectionContext.Transaction, _options);
182+
dataTable.SqlBulkCopy(temptableName, null, _connectionContext, _options);
183183
Log("End executing SqlBulkCopy.");
184184

185185
var sqlMergeStatement = mergeStatementBuilder.ToString();
@@ -449,7 +449,7 @@ public async Task<BulkMergeResult> ExecuteAsync(IEnumerable<T> data, Cancellatio
449449
Log("End creating temp table.");
450450

451451
Log($"Begin executing SqlBulkCopy. TableName: {temptableName}");
452-
await dataTable.SqlBulkCopyAsync(temptableName, null, _connectionContext.Connection, _connectionContext.Transaction, _options, cancellationToken);
452+
await dataTable.SqlBulkCopyAsync(temptableName, null, _connectionContext, _options, cancellationToken);
453453
Log("End executing SqlBulkCopy.");
454454

455455
var sqlMergeStatement = mergeStatementBuilder.ToString();

‎src/EntityFrameworkCore.SqlServer.SimpleBulks/BulkUpdate/BulkUpdateBuilder.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public BulkUpdateResult Execute(IEnumerable<T> data)
117117
Log("End creating temp table.");
118118

119119
Log($"Begin executing SqlBulkCopy. TableName: {temptableName}");
120-
dataTable.SqlBulkCopy(temptableName, null, _connectionContext.Connection, _connectionContext.Transaction, _options);
120+
dataTable.SqlBulkCopy(temptableName, null, _connectionContext, _options);
121121
Log("End executing SqlBulkCopy.");
122122

123123
var sqlUpdateStatement = updateStatementBuilder.ToString();
@@ -242,7 +242,7 @@ public async Task<BulkUpdateResult> ExecuteAsync(IEnumerable<T> data, Cancellati
242242
Log("End creating temp table.");
243243

244244
Log($"Begin executing SqlBulkCopy. TableName: {temptableName}");
245-
await dataTable.SqlBulkCopyAsync(temptableName, null, _connectionContext.Connection, _connectionContext.Transaction, _options, cancellationToken);
245+
await dataTable.SqlBulkCopyAsync(temptableName, null, _connectionContext, _options, cancellationToken);
246246
Log("End executing SqlBulkCopy.");
247247

248248
var sqlUpdateStatement = updateStatementBuilder.ToString();

‎src/EntityFrameworkCore.SqlServer.SimpleBulks/Extensions/DataTableExtensions.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ public static string GenerateTableDefinition(this DataTable table, string tableN
3636
return sql.ToString();
3737
}
3838

39-
public static void SqlBulkCopy(this DataTable dataTable, string tableName, IReadOnlyDictionary<string, string> columnNameMappings, SqlConnection connection, SqlTransaction transaction, BulkOptions options = null)
39+
public static void SqlBulkCopy(this DataTable dataTable, string tableName, IReadOnlyDictionary<string, string> columnNameMappings, ConnectionContext connectionContext, BulkOptions options = null)
4040
{
4141
options ??= DefaultBulkOptions;
4242

43-
using var bulkCopy = new SqlBulkCopy(connection, SqlBulkCopyOptions.Default, transaction)
43+
using var bulkCopy = new SqlBulkCopy(connectionContext.Connection, SqlBulkCopyOptions.Default, connectionContext.Transaction)
4444
{
4545
BatchSize = options.BatchSize,
4646
BulkCopyTimeout = options.Timeout,
@@ -55,11 +55,11 @@ public static void SqlBulkCopy(this DataTable dataTable, string tableName, IRead
5555
bulkCopy.WriteToServer(dataTable);
5656
}
5757

58-
public static async Task SqlBulkCopyAsync(this DataTable dataTable, string tableName, IReadOnlyDictionary<string, string> columnNameMappings, SqlConnection connection, SqlTransaction transaction, BulkOptions options = null, CancellationToken cancellationToken = default)
58+
public static async Task SqlBulkCopyAsync(this DataTable dataTable, string tableName, IReadOnlyDictionary<string, string> columnNameMappings, ConnectionContext connectionContext, BulkOptions options = null, CancellationToken cancellationToken = default)
5959
{
6060
options ??= DefaultBulkOptions;
6161

62-
using var bulkCopy = new SqlBulkCopy(connection, SqlBulkCopyOptions.Default, transaction)
62+
using var bulkCopy = new SqlBulkCopy(connectionContext.Connection, SqlBulkCopyOptions.Default, connectionContext.Transaction)
6363
{
6464
BatchSize = options.BatchSize,
6565
BulkCopyTimeout = options.Timeout,

‎src/EntityFrameworkCore.SqlServer.SimpleBulks/TempTable/TempTableBuilder.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public string Execute(IEnumerable<T> data)
8080

8181
Log($"Begin executing SqlBulkCopy. TableName: {tempTableName}");
8282

83-
dataTable.SqlBulkCopy(tempTableName, _mappingContext?.ColumnNameMappings, _connectionContext.Connection, _connectionContext.Transaction);
83+
dataTable.SqlBulkCopy(tempTableName, _mappingContext?.ColumnNameMappings, _connectionContext);
8484

8585
Log("End executing SqlBulkCopy.");
8686

@@ -110,7 +110,7 @@ public async Task<string> ExecuteAsync(IEnumerable<T> data, CancellationToken ca
110110

111111
Log($"Begin executing SqlBulkCopy. TableName: {tempTableName}");
112112

113-
await dataTable.SqlBulkCopyAsync(tempTableName, _mappingContext?.ColumnNameMappings, _connectionContext.Connection, _connectionContext.Transaction, cancellationToken: cancellationToken);
113+
await dataTable.SqlBulkCopyAsync(tempTableName, _mappingContext?.ColumnNameMappings, _connectionContext, cancellationToken: cancellationToken);
114114

115115
Log("End executing SqlBulkCopy.");
116116

0 commit comments

Comments
 (0)