Skip to content

Commit 5d709f6

Browse files
phongnguyendphongnguyend
committed
ConnectionContextExtensions
1 parent 11ae273 commit 5d709f6

File tree

9 files changed

+112
-112
lines changed

9 files changed

+112
-112
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,18 @@ public BulkDeleteResult Execute(IEnumerable<T> data)
8585

8686
var deleteStatement = $"DELETE a FROM {_table.SchemaQualifiedTableName} a JOIN {temptableName} b ON " + joinCondition;
8787

88-
_connectionContext.Connection.EnsureOpen();
88+
_connectionContext.EnsureOpen();
8989

9090
Log($"Begin creating temp table:{Environment.NewLine}{sqlCreateTemptable}");
9191

92-
using (var createTemptableCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, sqlCreateTemptable, _options))
92+
using (var createTemptableCommand = _connectionContext.CreateTextCommand(sqlCreateTemptable, _options))
9393
{
9494
createTemptableCommand.ExecuteNonQuery();
9595
}
9696

9797
Log("End creating temp table.");
9898

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

102102
dataTable.SqlBulkCopy(temptableName, null, _connectionContext.Connection, _connectionContext.Transaction, _options);
@@ -105,7 +105,7 @@ public BulkDeleteResult Execute(IEnumerable<T> data)
105105

106106
Log($"Begin deleting:{Environment.NewLine}{deleteStatement}");
107107

108-
using var deleteCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, deleteStatement, _options);
108+
using var deleteCommand = _connectionContext.CreateTextCommand(deleteStatement, _options);
109109

110110
var affectedRows = deleteCommand.ExecuteNonQuery();
111111

@@ -128,11 +128,11 @@ public BulkDeleteResult SingleDelete(T dataToDelete)
128128

129129
Log($"Begin deleting:{Environment.NewLine}{deleteStatement}");
130130

131-
using var deleteCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, deleteStatement, _options);
131+
using var deleteCommand = _connectionContext.CreateTextCommand(deleteStatement, _options);
132132

133133
_table.CreateSqlParameters(deleteCommand, dataToDelete, _idColumns).ForEach(x => deleteCommand.Parameters.Add(x));
134134

135-
_connectionContext.Connection.EnsureOpen();
135+
_connectionContext.EnsureOpen();
136136

137137
var affectedRows = deleteCommand.ExecuteNonQuery();
138138

@@ -169,11 +169,11 @@ public async Task<BulkDeleteResult> ExecuteAsync(IEnumerable<T> data, Cancellati
169169

170170
var deleteStatement = $"DELETE a FROM {_table.SchemaQualifiedTableName} a JOIN {temptableName} b ON " + joinCondition;
171171

172-
await _connectionContext.Connection.EnsureOpenAsync(cancellationToken);
172+
await _connectionContext.EnsureOpenAsync(cancellationToken);
173173

174174
Log($"Begin creating temp table:{Environment.NewLine}{sqlCreateTemptable}");
175175

176-
using (var createTemptableCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, sqlCreateTemptable, _options))
176+
using (var createTemptableCommand = _connectionContext.CreateTextCommand(sqlCreateTemptable, _options))
177177
{
178178
await createTemptableCommand.ExecuteNonQueryAsync(cancellationToken);
179179
}
@@ -188,7 +188,7 @@ public async Task<BulkDeleteResult> ExecuteAsync(IEnumerable<T> data, Cancellati
188188

189189
Log($"Begin deleting:{Environment.NewLine}{deleteStatement}");
190190

191-
using var deleteCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, deleteStatement, _options);
191+
using var deleteCommand = _connectionContext.CreateTextCommand(deleteStatement, _options);
192192

193193
var affectedRows = await deleteCommand.ExecuteNonQueryAsync(cancellationToken);
194194

@@ -211,11 +211,11 @@ public async Task<BulkDeleteResult> SingleDeleteAsync(T dataToDelete, Cancellati
211211

212212
Log($"Begin deleting:{Environment.NewLine}{deleteStatement}");
213213

214-
using var deleteCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, deleteStatement, _options);
214+
using var deleteCommand = _connectionContext.CreateTextCommand(deleteStatement, _options);
215215

216216
_table.CreateSqlParameters(deleteCommand, dataToDelete, _idColumns).ForEach(x => deleteCommand.Parameters.Add(x));
217217

218-
await _connectionContext.Connection.EnsureOpenAsync(cancellationToken);
218+
await _connectionContext.EnsureOpenAsync(cancellationToken);
219219

220220
var affectedRows = await deleteCommand.ExecuteNonQueryAsync(cancellationToken);
221221

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public void Execute(IEnumerable<T> data)
118118
{
119119
dataTable = data.ToDataTable(_columnNames, valueConverters: _table.ValueConverters);
120120

121-
_connectionContext.Connection.EnsureOpen();
121+
_connectionContext.EnsureOpen();
122122

123123
Log($"Begin executing SqlBulkCopy. TableName: {_table.SchemaQualifiedTableName}");
124124
dataTable.SqlBulkCopy(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext.Connection, _connectionContext.Transaction, _options);
@@ -136,7 +136,7 @@ public void Execute(IEnumerable<T> data)
136136

137137
dataTable = data.ToDataTable(columnsToInsert, valueConverters: _table.ValueConverters);
138138

139-
_connectionContext.Connection.EnsureOpen();
139+
_connectionContext.EnsureOpen();
140140

141141
Log($"Begin executing SqlBulkCopy. TableName: {_table.SchemaQualifiedTableName}");
142142
dataTable.SqlBulkCopy(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext.Connection, _connectionContext.Transaction, _options);
@@ -163,7 +163,7 @@ public void Execute(IEnumerable<T> data)
163163

164164
dataTable = data.ToDataTable(columnsToInsert, valueConverters: _table.ValueConverters);
165165

166-
_connectionContext.Connection.EnsureOpen();
166+
_connectionContext.EnsureOpen();
167167

168168
Log($"Begin executing SqlBulkCopy. TableName: {_table.SchemaQualifiedTableName}");
169169
dataTable.SqlBulkCopy(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext.Connection, _connectionContext.Transaction, _options);
@@ -188,10 +188,10 @@ public void Execute(IEnumerable<T> data)
188188
mergeStatementBuilder.AppendLine($"OUTPUT inserted.[{GetDbColumnName(_outputIdColumn)}], Src.[{Constants.AutoGeneratedIndexNumberColumn}]");
189189
mergeStatementBuilder.AppendLine(";");
190190

191-
_connectionContext.Connection.EnsureOpen();
191+
_connectionContext.EnsureOpen();
192192

193193
Log($"Begin creating temp table:{Environment.NewLine}{sqlCreateTemptable}");
194-
using (var createTemptableCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, sqlCreateTemptable, _options))
194+
using (var createTemptableCommand = _connectionContext.CreateTextCommand(sqlCreateTemptable, _options))
195195
{
196196
createTemptableCommand.ExecuteNonQuery();
197197
}
@@ -206,7 +206,7 @@ public void Execute(IEnumerable<T> data)
206206
var sqlMergeStatement = mergeStatementBuilder.ToString();
207207

208208
Log($"Begin merging temp table:{Environment.NewLine}{sqlMergeStatement}");
209-
using (var updateCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, sqlMergeStatement, _options))
209+
using (var updateCommand = _connectionContext.CreateTextCommand(sqlMergeStatement, _options))
210210
{
211211
using var reader = updateCommand.ExecuteReader();
212212
var dbColumn = GetDbColumnName(_outputIdColumn);
@@ -269,13 +269,13 @@ public void SingleInsert(T dataToInsert)
269269

270270
var insertStatement = insertStatementBuilder.ToString();
271271

272-
using var insertCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, insertStatement, _options);
272+
using var insertCommand = _connectionContext.CreateTextCommand(insertStatement, _options);
273273

274274
_table.CreateSqlParameters(insertCommand, dataToInsert, columnsToInsert).ForEach(x => insertCommand.Parameters.Add(x));
275275

276276
Log($"Begin inserting: {Environment.NewLine}{insertStatement}");
277277

278-
_connectionContext.Connection.EnsureOpen();
278+
_connectionContext.EnsureOpen();
279279

280280
if (_options.KeepIdentity || !ReturnGeneratedId)
281281
{
@@ -317,7 +317,7 @@ public async Task ExecuteAsync(IEnumerable<T> data, CancellationToken cancellati
317317
{
318318
dataTable = await data.ToDataTableAsync(_columnNames, valueConverters: _table.ValueConverters, cancellationToken: cancellationToken);
319319

320-
await _connectionContext.Connection.EnsureOpenAsync(cancellationToken);
320+
await _connectionContext.EnsureOpenAsync(cancellationToken);
321321

322322
Log($"Begin executing SqlBulkCopy. TableName: {_table.SchemaQualifiedTableName}");
323323
await dataTable.SqlBulkCopyAsync(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext.Connection, _connectionContext.Transaction, _options, cancellationToken);
@@ -335,7 +335,7 @@ public async Task ExecuteAsync(IEnumerable<T> data, CancellationToken cancellati
335335

336336
dataTable = await data.ToDataTableAsync(columnsToInsert, valueConverters: _table.ValueConverters, cancellationToken: cancellationToken);
337337

338-
await _connectionContext.Connection.EnsureOpenAsync(cancellationToken);
338+
await _connectionContext.EnsureOpenAsync(cancellationToken);
339339

340340
Log($"Begin executing SqlBulkCopy. TableName: {_table.SchemaQualifiedTableName}");
341341
await dataTable.SqlBulkCopyAsync(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext.Connection, _connectionContext.Transaction, _options, cancellationToken);
@@ -362,7 +362,7 @@ public async Task ExecuteAsync(IEnumerable<T> data, CancellationToken cancellati
362362

363363
dataTable = await data.ToDataTableAsync(columnsToInsert, valueConverters: _table.ValueConverters, cancellationToken: cancellationToken);
364364

365-
await _connectionContext.Connection.EnsureOpenAsync(cancellationToken);
365+
await _connectionContext.EnsureOpenAsync(cancellationToken);
366366

367367
Log($"Begin executing SqlBulkCopy. TableName: {_table.SchemaQualifiedTableName}");
368368
await dataTable.SqlBulkCopyAsync(_table.SchemaQualifiedTableName, _table.ColumnNameMappings, _connectionContext.Connection, _connectionContext.Transaction, _options, cancellationToken);
@@ -387,10 +387,10 @@ public async Task ExecuteAsync(IEnumerable<T> data, CancellationToken cancellati
387387
mergeStatementBuilder.AppendLine($"OUTPUT inserted.[{GetDbColumnName(_outputIdColumn)}], Src.[{Constants.AutoGeneratedIndexNumberColumn}]");
388388
mergeStatementBuilder.AppendLine(";");
389389

390-
await _connectionContext.Connection.EnsureOpenAsync(cancellationToken);
390+
await _connectionContext.EnsureOpenAsync(cancellationToken);
391391

392392
Log($"Begin creating temp table:{Environment.NewLine}{sqlCreateTemptable}");
393-
using (var createTemptableCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, sqlCreateTemptable, _options))
393+
using (var createTemptableCommand = _connectionContext.CreateTextCommand(sqlCreateTemptable, _options))
394394
{
395395
await createTemptableCommand.ExecuteNonQueryAsync(cancellationToken);
396396
}
@@ -405,7 +405,7 @@ public async Task ExecuteAsync(IEnumerable<T> data, CancellationToken cancellati
405405
var sqlMergeStatement = mergeStatementBuilder.ToString();
406406

407407
Log($"Begin merging temp table:{Environment.NewLine}{sqlMergeStatement}");
408-
using (var updateCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, sqlMergeStatement, _options))
408+
using (var updateCommand = _connectionContext.CreateTextCommand(sqlMergeStatement, _options))
409409
{
410410
using var reader = await updateCommand.ExecuteReaderAsync(cancellationToken);
411411
var dbColumn = GetDbColumnName(_outputIdColumn);
@@ -468,12 +468,12 @@ public async Task SingleInsertAsync(T dataToInsert, CancellationToken cancellati
468468

469469
var insertStatement = insertStatementBuilder.ToString();
470470

471-
using var insertCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, insertStatement, _options);
471+
using var insertCommand = _connectionContext.CreateTextCommand(insertStatement, _options);
472472
_table.CreateSqlParameters(insertCommand, dataToInsert, columnsToInsert).ForEach(x => insertCommand.Parameters.Add(x));
473473

474474
Log($"Begin inserting: {Environment.NewLine}{insertStatement}");
475475

476-
await _connectionContext.Connection.EnsureOpenAsync(cancellationToken);
476+
await _connectionContext.EnsureOpenAsync(cancellationToken);
477477

478478
if (_options.KeepIdentity || !ReturnGeneratedId)
479479
{

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ public List<T> Execute(IEnumerable<T> machedValues)
101101
selectQueryBuilder.AppendLine($"SELECT {string.Join(", ", _returnedColumns.Select(x => CreateSelectStatement(x)))} ");
102102
selectQueryBuilder.AppendLine($"FROM {_table.SchemaQualifiedTableName} a JOIN {temptableName} b ON " + joinCondition);
103103

104-
_connectionContext.Connection.EnsureOpen();
104+
_connectionContext.EnsureOpen();
105105

106106
Log($"Begin creating temp table:{Environment.NewLine}{sqlCreateTemptable}");
107107

108-
using (var createTemptableCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, sqlCreateTemptable, _options))
108+
using (var createTemptableCommand = _connectionContext.CreateTextCommand(sqlCreateTemptable, _options))
109109
{
110110
createTemptableCommand.ExecuteNonQuery();
111111
}
@@ -127,7 +127,7 @@ public List<T> Execute(IEnumerable<T> machedValues)
127127

128128
var properties = typeof(T).GetProperties().Where(prop => _returnedColumns.Contains(prop.Name)).ToList();
129129

130-
using var updateCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, selectQuery, _options);
130+
using var updateCommand = _connectionContext.CreateTextCommand(selectQuery, _options);
131131
using var reader = updateCommand.ExecuteReader();
132132
while (reader.Read())
133133
{
@@ -177,11 +177,11 @@ public async Task<List<T>> ExecuteAsync(IEnumerable<T> machedValues, Cancellatio
177177
selectQueryBuilder.AppendLine($"SELECT {string.Join(", ", _returnedColumns.Select(x => CreateSelectStatement(x)))} ");
178178
selectQueryBuilder.AppendLine($"FROM {_table.SchemaQualifiedTableName} a JOIN {temptableName} b ON " + joinCondition);
179179

180-
await _connectionContext.Connection.EnsureOpenAsync(cancellationToken);
180+
await _connectionContext.EnsureOpenAsync(cancellationToken);
181181

182182
Log($"Begin creating temp table:{Environment.NewLine}{sqlCreateTemptable}");
183183

184-
using (var createTemptableCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, sqlCreateTemptable, _options))
184+
using (var createTemptableCommand = _connectionContext.CreateTextCommand(sqlCreateTemptable, _options))
185185
{
186186
await createTemptableCommand.ExecuteNonQueryAsync(cancellationToken);
187187
}
@@ -202,7 +202,7 @@ public async Task<List<T>> ExecuteAsync(IEnumerable<T> machedValues, Cancellatio
202202

203203
var properties = typeof(T).GetProperties().Where(prop => _returnedColumns.Contains(prop.Name)).ToList();
204204

205-
using var updateCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, selectQuery, _options);
205+
using var updateCommand = _connectionContext.CreateTextCommand(selectQuery, _options);
206206
using var reader = await updateCommand.ExecuteReaderAsync(cancellationToken);
207207
while (await reader.ReadAsync(cancellationToken))
208208
{

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,10 @@ public BulkMergeResult Execute(IEnumerable<T> data)
169169

170170
mergeStatementBuilder.AppendLine(";");
171171

172-
_connectionContext.Connection.EnsureOpen();
172+
_connectionContext.EnsureOpen();
173173

174174
Log($"Begin creating temp table:{Environment.NewLine}{sqlCreateTemptable}");
175-
using (var createTemptableCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, sqlCreateTemptable, _options))
175+
using (var createTemptableCommand = _connectionContext.CreateTextCommand(sqlCreateTemptable, _options))
176176
{
177177
createTemptableCommand.ExecuteNonQuery();
178178
}
@@ -196,7 +196,7 @@ public BulkMergeResult Execute(IEnumerable<T> data)
196196
outputIdDbColumnName = GetDbColumnName(_outputIdColumn);
197197
}
198198

199-
using (var updateCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, sqlMergeStatement, _options))
199+
using (var updateCommand = _connectionContext.CreateTextCommand(sqlMergeStatement, _options))
200200
{
201201
using var reader = updateCommand.ExecuteReader();
202202

@@ -302,7 +302,7 @@ public BulkMergeResult SingleMerge(T data)
302302

303303
mergeStatementBuilder.AppendLine(";");
304304

305-
_connectionContext.Connection.EnsureOpen();
305+
_connectionContext.EnsureOpen();
306306

307307
var sqlMergeStatement = mergeStatementBuilder.ToString();
308308

@@ -316,7 +316,7 @@ public BulkMergeResult SingleMerge(T data)
316316
outputIdDbColumnName = GetDbColumnName(_outputIdColumn);
317317
}
318318

319-
using (var updateCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, sqlMergeStatement, _options))
319+
using (var updateCommand = _connectionContext.CreateTextCommand(sqlMergeStatement, _options))
320320
{
321321
_table.CreateSqlParameters(updateCommand, data, propertyNames)
322322
.ForEach(x => updateCommand.Parameters.Add(x));
@@ -439,10 +439,10 @@ public async Task<BulkMergeResult> ExecuteAsync(IEnumerable<T> data, Cancellatio
439439

440440
mergeStatementBuilder.AppendLine(";");
441441

442-
await _connectionContext.Connection.EnsureOpenAsync(cancellationToken);
442+
await _connectionContext.EnsureOpenAsync(cancellationToken);
443443

444444
Log($"Begin creating temp table:{Environment.NewLine}{sqlCreateTemptable}");
445-
using (var createTemptableCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, sqlCreateTemptable, _options))
445+
using (var createTemptableCommand = _connectionContext.CreateTextCommand(sqlCreateTemptable, _options))
446446
{
447447
await createTemptableCommand.ExecuteNonQueryAsync(cancellationToken);
448448
}
@@ -466,7 +466,7 @@ public async Task<BulkMergeResult> ExecuteAsync(IEnumerable<T> data, Cancellatio
466466
outputIdDbColumnName = GetDbColumnName(_outputIdColumn);
467467
}
468468

469-
using (var updateCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, sqlMergeStatement, _options))
469+
using (var updateCommand = _connectionContext.CreateTextCommand(sqlMergeStatement, _options))
470470
{
471471
using var reader = await updateCommand.ExecuteReaderAsync(cancellationToken);
472472

@@ -572,7 +572,7 @@ public async Task<BulkMergeResult> SingleMergeAsync(T data, CancellationToken ca
572572

573573
mergeStatementBuilder.AppendLine(";");
574574

575-
await _connectionContext.Connection.EnsureOpenAsync(cancellationToken);
575+
await _connectionContext.EnsureOpenAsync(cancellationToken);
576576

577577
var sqlMergeStatement = mergeStatementBuilder.ToString();
578578

@@ -586,7 +586,7 @@ public async Task<BulkMergeResult> SingleMergeAsync(T data, CancellationToken ca
586586
outputIdDbColumnName = GetDbColumnName(_outputIdColumn);
587587
}
588588

589-
using (var updateCommand = _connectionContext.Connection.CreateTextCommand(_connectionContext.Transaction, sqlMergeStatement, _options))
589+
using (var updateCommand = _connectionContext.CreateTextCommand(sqlMergeStatement, _options))
590590
{
591591
_table.CreateSqlParameters(updateCommand, data, propertyNames)
592592
.ForEach(x => updateCommand.Parameters.Add(x));

0 commit comments

Comments
 (0)