Skip to content

Commit 74621a5

Browse files
committed
ConnectionContext
1 parent 1811625 commit 74621a5

19 files changed

+548
-531
lines changed

src/EntityFrameworkCore.SqlServer.SimpleBulks.ConnectionExtensionsTests/ConnectionExtensions/BulkDeleteAsyncTests.cs

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -52,65 +52,67 @@ public BulkDeleteAsyncTests(ITestOutputHelper output, SqlServerFixture fixture)
5252
[InlineData(false, false)]
5353
public async Task Bulk_Delete_Without_Transaction(bool useLinq, bool omitTableName)
5454
{
55+
var connectionContext = new ConnectionContext(_connection, null);
56+
5557
var rows = _context.SingleKeyRows.AsNoTracking().Take(99).ToList();
5658
var compositeKeyRows = _context.CompositeKeyRows.AsNoTracking().Take(99).ToList();
5759

5860
if (useLinq)
5961
{
6062
if (omitTableName)
6163
{
62-
await _connection.BulkDeleteAsync(rows, row => row.Id,
63-
options =>
64-
{
65-
options.LogTo = _output.WriteLine;
66-
});
67-
await _connection.BulkDeleteAsync(compositeKeyRows, row => new { row.Id1, row.Id2 },
68-
options =>
69-
{
70-
options.LogTo = _output.WriteLine;
71-
});
64+
await connectionContext.BulkDeleteAsync(rows, row => row.Id,
65+
options =>
66+
{
67+
options.LogTo = _output.WriteLine;
68+
});
69+
await connectionContext.BulkDeleteAsync(compositeKeyRows, row => new { row.Id1, row.Id2 },
70+
options =>
71+
{
72+
options.LogTo = _output.WriteLine;
73+
});
7274
}
7375
else
7476
{
75-
await _connection.BulkDeleteAsync(rows, new SqlTableInfor(_schema, "SingleKeyRows"), row => row.Id,
76-
options =>
77-
{
78-
options.LogTo = _output.WriteLine;
79-
});
80-
await _connection.BulkDeleteAsync(compositeKeyRows, new SqlTableInfor(_schema, "CompositeKeyRows"), row => new { row.Id1, row.Id2 },
77+
await connectionContext.BulkDeleteAsync(rows, new SqlTableInfor(_schema, "SingleKeyRows"), row => row.Id,
78+
options =>
79+
{
80+
options.LogTo = _output.WriteLine;
81+
});
82+
await connectionContext.BulkDeleteAsync(compositeKeyRows, new SqlTableInfor(_schema, "CompositeKeyRows"), row => new { row.Id1, row.Id2 },
8183
options =>
82-
{
83-
options.LogTo = _output.WriteLine;
84-
});
84+
{
85+
options.LogTo = _output.WriteLine;
86+
});
8587
}
8688
}
8789
else
8890
{
8991
if (omitTableName)
9092
{
91-
await _connection.BulkDeleteAsync(rows, "Id",
92-
options =>
93-
{
94-
options.LogTo = _output.WriteLine;
95-
});
96-
await _connection.BulkDeleteAsync(compositeKeyRows, ["Id1", "Id2"],
97-
options =>
98-
{
99-
options.LogTo = _output.WriteLine;
100-
});
93+
await connectionContext.BulkDeleteAsync(rows, "Id",
94+
options =>
95+
{
96+
options.LogTo = _output.WriteLine;
97+
});
98+
await connectionContext.BulkDeleteAsync(compositeKeyRows, ["Id1", "Id2"],
99+
options =>
100+
{
101+
options.LogTo = _output.WriteLine;
102+
});
101103
}
102104
else
103105
{
104-
await _connection.BulkDeleteAsync(rows, new SqlTableInfor(_schema, "SingleKeyRows"), "Id",
105-
options =>
106-
{
107-
options.LogTo = _output.WriteLine;
108-
});
109-
await _connection.BulkDeleteAsync(compositeKeyRows, new SqlTableInfor(_schema, "CompositeKeyRows"), ["Id1", "Id2"],
110-
options =>
111-
{
112-
options.LogTo = _output.WriteLine;
113-
});
106+
await connectionContext.BulkDeleteAsync(rows, new SqlTableInfor(_schema, "SingleKeyRows"), "Id",
107+
options =>
108+
{
109+
options.LogTo = _output.WriteLine;
110+
});
111+
await connectionContext.BulkDeleteAsync(compositeKeyRows, new SqlTableInfor(_schema, "CompositeKeyRows"), ["Id1", "Id2"],
112+
options =>
113+
{
114+
options.LogTo = _output.WriteLine;
115+
});
114116
}
115117
}
116118

src/EntityFrameworkCore.SqlServer.SimpleBulks.ConnectionExtensionsTests/ConnectionExtensions/BulkDeleteTests.cs

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ public BulkDeleteTests(ITestOutputHelper output, SqlServerFixture fixture) : bas
3939
}
4040

4141
_context.BulkInsert(rows,
42-
row => new { row.Column1, row.Column2, row.Column3 });
42+
row => new { row.Column1, row.Column2, row.Column3 });
4343

4444
_context.BulkInsert(compositeKeyRows,
45-
row => new { row.Id1, row.Id2, row.Column1, row.Column2, row.Column3 });
45+
row => new { row.Id1, row.Id2, row.Column1, row.Column2, row.Column3 });
4646
}
4747

4848
[Theory]
@@ -52,65 +52,67 @@ public BulkDeleteTests(ITestOutputHelper output, SqlServerFixture fixture) : bas
5252
[InlineData(false, false)]
5353
public void Bulk_Delete_Without_Transaction(bool useLinq, bool omitTableName)
5454
{
55+
var connectionContext = new ConnectionContext(_connection, null);
56+
5557
var rows = _context.SingleKeyRows.AsNoTracking().Take(99).ToList();
5658
var compositeKeyRows = _context.CompositeKeyRows.AsNoTracking().Take(99).ToList();
5759

5860
if (useLinq)
5961
{
6062
if (omitTableName)
6163
{
62-
_connection.BulkDelete(rows, row => row.Id,
63-
options =>
64-
{
65-
options.LogTo = _output.WriteLine;
66-
});
67-
_connection.BulkDelete(compositeKeyRows, row => new { row.Id1, row.Id2 },
68-
options =>
69-
{
70-
options.LogTo = _output.WriteLine;
71-
});
64+
connectionContext.BulkDelete(rows, row => row.Id,
65+
options =>
66+
{
67+
options.LogTo = _output.WriteLine;
68+
});
69+
connectionContext.BulkDelete(compositeKeyRows, row => new { row.Id1, row.Id2 },
70+
options =>
71+
{
72+
options.LogTo = _output.WriteLine;
73+
});
7274
}
7375
else
7476
{
75-
_connection.BulkDelete(rows, new SqlTableInfor(_schema, "SingleKeyRows"), row => row.Id,
76-
options =>
77-
{
78-
options.LogTo = _output.WriteLine;
79-
});
80-
_connection.BulkDelete(compositeKeyRows, new SqlTableInfor(_schema, "CompositeKeyRows"), row => new { row.Id1, row.Id2 },
81-
options =>
82-
{
83-
options.LogTo = _output.WriteLine;
84-
});
77+
connectionContext.BulkDelete(rows, new SqlTableInfor(_schema, "SingleKeyRows"), row => row.Id,
78+
options =>
79+
{
80+
options.LogTo = _output.WriteLine;
81+
});
82+
connectionContext.BulkDelete(compositeKeyRows, new SqlTableInfor(_schema, "CompositeKeyRows"), row => new { row.Id1, row.Id2 },
83+
options =>
84+
{
85+
options.LogTo = _output.WriteLine;
86+
});
8587
}
8688
}
8789
else
8890
{
8991
if (omitTableName)
9092
{
91-
_connection.BulkDelete(rows, "Id",
92-
options =>
93-
{
94-
options.LogTo = _output.WriteLine;
95-
});
96-
_connection.BulkDelete(compositeKeyRows, ["Id1", "Id2"],
97-
options =>
93+
connectionContext.BulkDelete(rows, "Id",
94+
options =>
9895
{
9996
options.LogTo = _output.WriteLine;
10097
});
98+
connectionContext.BulkDelete(compositeKeyRows, ["Id1", "Id2"],
99+
options =>
100+
{
101+
options.LogTo = _output.WriteLine;
102+
});
101103
}
102104
else
103105
{
104-
_connection.BulkDelete(rows, new SqlTableInfor(_schema, "SingleKeyRows"), "Id",
105-
options =>
106-
{
107-
options.LogTo = _output.WriteLine;
108-
});
109-
_connection.BulkDelete(compositeKeyRows, new SqlTableInfor(_schema, "CompositeKeyRows"), ["Id1", "Id2"],
110-
options =>
111-
{
112-
options.LogTo = _output.WriteLine;
113-
});
106+
connectionContext.BulkDelete(rows, new SqlTableInfor(_schema, "SingleKeyRows"), "Id",
107+
options =>
108+
{
109+
options.LogTo = _output.WriteLine;
110+
});
111+
connectionContext.BulkDelete(compositeKeyRows, new SqlTableInfor(_schema, "CompositeKeyRows"), ["Id1", "Id2"],
112+
options =>
113+
{
114+
options.LogTo = _output.WriteLine;
115+
});
114116
}
115117
}
116118

src/EntityFrameworkCore.SqlServer.SimpleBulks.ConnectionExtensionsTests/ConnectionExtensions/BulkInsertAsyncTests.cs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ public BulkInsertAsyncTests(ITestOutputHelper output, SqlServerFixture fixture)
2323
[InlineData(false, false)]
2424
public async Task Bulk_Insert_Without_Transaction(bool useLinq, bool omitTableName)
2525
{
26+
var connectionContext = new ConnectionContext(_connection, null);
27+
2628
var rows = new List<SingleKeyRow<int>>();
2729
var compositeKeyRows = new List<CompositeKeyRow<int, int>>();
2830

@@ -49,15 +51,15 @@ public async Task Bulk_Insert_Without_Transaction(bool useLinq, bool omitTableNa
4951
{
5052
if (omitTableName)
5153
{
52-
await _connection.BulkInsertAsync(rows,
54+
await connectionContext.BulkInsertAsync(rows,
5355
row => new { row.Column1, row.Column2, row.Column3 },
5456
row => row.Id,
5557
options =>
5658
{
5759
options.LogTo = _output.WriteLine;
5860
});
5961

60-
await _connection.BulkInsertAsync(compositeKeyRows,
62+
await connectionContext.BulkInsertAsync(compositeKeyRows,
6163
row => new { row.Id1, row.Id2, row.Column1, row.Column2, row.Column3 },
6264
options =>
6365
{
@@ -66,15 +68,15 @@ await _connection.BulkInsertAsync(compositeKeyRows,
6668
}
6769
else
6870
{
69-
await _connection.BulkInsertAsync(rows, new SqlTableInfor(_schema, "SingleKeyRows"),
71+
await connectionContext.BulkInsertAsync(rows, new SqlTableInfor(_schema, "SingleKeyRows"),
7072
row => new { row.Column1, row.Column2, row.Column3 },
7173
row => row.Id,
7274
options =>
7375
{
7476
options.LogTo = _output.WriteLine;
7577
});
7678

77-
await _connection.BulkInsertAsync(compositeKeyRows, new SqlTableInfor(_schema, "CompositeKeyRows"),
79+
await connectionContext.BulkInsertAsync(compositeKeyRows, new SqlTableInfor(_schema, "CompositeKeyRows"),
7880
row => new { row.Id1, row.Id2, row.Column1, row.Column2, row.Column3 },
7981
options =>
8082
{
@@ -87,15 +89,15 @@ await _connection.BulkInsertAsync(compositeKeyRows,
8789
{
8890
if (omitTableName)
8991
{
90-
await _connection.BulkInsertAsync(rows,
92+
await connectionContext.BulkInsertAsync(rows,
9193
["Column1", "Column2", "Column3"],
9294
"Id",
9395
options =>
9496
{
9597
options.LogTo = _output.WriteLine;
9698
});
9799

98-
await _connection.BulkInsertAsync(compositeKeyRows,
100+
await connectionContext.BulkInsertAsync(compositeKeyRows,
99101
["Id1", "Id2", "Column1", "Column2", "Column3"],
100102
options =>
101103
{
@@ -104,15 +106,15 @@ await _connection.BulkInsertAsync(compositeKeyRows,
104106
}
105107
else
106108
{
107-
await _connection.BulkInsertAsync(rows, new SqlTableInfor(_schema, "SingleKeyRows"),
109+
await connectionContext.BulkInsertAsync(rows, new SqlTableInfor(_schema, "SingleKeyRows"),
108110
["Column1", "Column2", "Column3"],
109111
"Id",
110112
options =>
111113
{
112114
options.LogTo = _output.WriteLine;
113115
});
114116

115-
await _connection.BulkInsertAsync(compositeKeyRows, new SqlTableInfor(_schema, "CompositeKeyRows"),
117+
await connectionContext.BulkInsertAsync(compositeKeyRows, new SqlTableInfor(_schema, "CompositeKeyRows"),
116118
["Id1", "Id2", "Column1", "Column2", "Column3"],
117119
options =>
118120
{

0 commit comments

Comments
 (0)