Skip to content

Commit 34b4f7d

Browse files
committed
Merge branch 'remove-warnings' into 7.0
2 parents adbd9e9 + beaf235 commit 34b4f7d

File tree

5 files changed

+25
-26
lines changed

5 files changed

+25
-26
lines changed

Extensions/Xtensive.Orm.Web/SessionManager.cs

-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ public async Task Invoke(HttpContext context)
115115
await nextMiddlewareRunner.Invoke(context);
116116
}
117117
catch (Exception) {
118-
var
119118
HasErrors = true;
120119
throw;
121120
}

Orm/Xtensive.Orm.Tests/Linq/InTest.cs

+18-18
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ public async Task StringContainsAsyncTest()
5252
var list = new List<string> { "Michelle", "Jack" };
5353
var query1 = (await (from c in Session.Query.All<Customer>()
5454
where !c.FirstName.In(list)
55-
select c.Invoices).AsAsync()).ToList();
55+
select c.Invoices).ExecuteAsync()).ToList();
5656
var query2 = (await (from c in Session.Query.All<Customer>()
5757
where !c.FirstName.In("Michelle", "Jack")
58-
select c.Invoices).AsAsync()).ToList();
58+
select c.Invoices).ExecuteAsync()).ToList();
5959
var expected1 = from c in Customers
6060
where !list.Contains(c.FirstName)
6161
select c.Invoices;
@@ -115,10 +115,10 @@ public async Task LongSequenceIntAsyncTest()
115115
list2.AddRange(list1);
116116
var query1 = (await (from invoice in Session.Query.All<Invoice>()
117117
where (invoice.Commission).In(list1)
118-
select invoice).AsAsync()).ToList();
118+
select invoice).ExecuteAsync()).ToList();
119119
var query2 = (await (from invoice in Session.Query.All<Invoice>()
120120
where (invoice.Commission).In(list2)
121-
select invoice).AsAsync()).ToList();
121+
select invoice).ExecuteAsync()).ToList();
122122
var expected = from invoice in Invoices
123123
where (invoice.Commission).In(list1)
124124
select invoice;
@@ -151,7 +151,7 @@ public async Task IntAndDecimalContains1AsyncTest()
151151
var list = new List<int> { 5, 18, 41 };
152152
var query = (await (from invoice in Session.Query.All<Invoice>()
153153
where !((int) invoice.Commission).In(list)
154-
select invoice).AsAsync()).ToList();
154+
select invoice).ExecuteAsync()).ToList();
155155
var expected = from invoice in Invoices
156156
where !((int) invoice.Commission).In(list)
157157
select invoice;
@@ -181,7 +181,7 @@ public async Task SimpleIntContainsAsyncTest()
181181
var list = new List<int> { 276192, 349492, 232463 };
182182
var query = (await (from track in Session.Query.All<Track>()
183183
where track.Milliseconds.In(list)
184-
select track).AsAsync()).ToList();
184+
select track).ExecuteAsync()).ToList();
185185
var expected = from track in Tracks
186186
where track.Milliseconds.In(list)
187187
select track;
@@ -236,7 +236,7 @@ public async Task IntAndDecimalContains2AsyncTest()
236236
var list = new List<decimal> { 7, 22, 46 };
237237
var query = (await (from invoice in Session.Query.All<Invoice>()
238238
where !((decimal) invoice.InvoiceId).In(list)
239-
select invoice).AsAsync()).ToList();
239+
select invoice).ExecuteAsync()).ToList();
240240
var expected = from invoice in Invoices
241241
where !((decimal) invoice.InvoiceId).In(list)
242242
select invoice;
@@ -266,7 +266,7 @@ public async Task EntityContainsAsyncTest()
266266
var list = Session.Query.All<Customer>().Take(5).ToList();
267267
var query = (await (from c in Session.Query.All<Customer>()
268268
where !c.In(list)
269-
select c.Invoices).AsAsync()).ToList();
269+
select c.Invoices).ExecuteAsync()).ToList();
270270
var expected = from c in Customers
271271
where !c.In(list)
272272
select c.Invoices;
@@ -296,7 +296,7 @@ public async Task StructContainsAsyncTest()
296296
var list = Session.Query.All<Customer>().Take(5).Select(c => c.Address).ToList();
297297
var query = (await (from c in Session.Query.All<Customer>()
298298
where !c.Address.In(list)
299-
select c.Invoices).AsAsync()).ToList();
299+
select c.Invoices).ExecuteAsync()).ToList();
300300
var expected = from c in Customers
301301
where !c.Address.In(list)
302302
select c.Invoices;
@@ -316,7 +316,7 @@ public void StructSimpleContainsTest()
316316
[Test]
317317
public async Task StructSimpleContainsAsyncTest()
318318
{
319-
var list = (await Session.Query.All<Customer>().Take(5).Select(c => c.Address).AsAsync()).ToList();
319+
var list = (await Session.Query.All<Customer>().Take(5).Select(c => c.Address).ExecuteAsync()).ToList();
320320
var query = Session.Query.All<Customer>().Select(c => c.Address).Where(c => c.In(list));
321321
QueryDumper.Dump(query);
322322
}
@@ -339,7 +339,7 @@ public async Task AnonimousContainsAsyncTest()
339339
var query = (await Session.Query.All<Customer>()
340340
.Where(c => new { c.FirstName }.In(list))
341341
.Select(c => c.Invoices)
342-
.AsAsync()).ToList();
342+
.ExecuteAsync()).ToList();
343343
var expected = Customers.Where(c => new { c.FirstName }.In(list)).Select(c => c.Invoices);
344344
Assert.That(query, Is.Not.Empty);
345345
Assert.AreEqual(0, expected.Except(query).Count());
@@ -364,7 +364,7 @@ public async Task AnonimousContains2AsyncTest()
364364
var query = (await Session.Query.All<Customer>()
365365
.Where(c => new { Id1 = c.FirstName, Id2 = c.FirstName }.In(list))
366366
.Select(c => c.Invoices)
367-
.AsAsync()).ToList();
367+
.ExecuteAsync()).ToList();
368368
var expected = Customers.Where(c => new { Id1 = c.FirstName, Id2 = c.FirstName }.In(list)).Select(c => c.Invoices);
369369
Assert.That(query, Is.Not.Empty);
370370
Assert.AreEqual(0, expected.Except(query).Count());
@@ -398,7 +398,7 @@ public async Task QueryableDoubleContainsAsyncTest()
398398
.Take(10);
399399
var query = (await (from invoice in Session.Query.All<Invoice>()
400400
where !invoice.Commission.In(list)
401-
select invoice).AsAsync()).ToList();
401+
select invoice).ExecuteAsync()).ToList();
402402
var expected = from invoice in Invoices
403403
where !invoice.Commission.In(list)
404404
select invoice;
@@ -428,7 +428,7 @@ public async Task QueryableEntityContainsAsyncTest()
428428
var list = Session.Query.All<Customer>().Take(5);
429429
var query = (await (from c in Session.Query.All<Customer>()
430430
where !c.In(list)
431-
select c.Invoices).AsAsync()).ToList();
431+
select c.Invoices).ExecuteAsync()).ToList();
432432
var expected = from c in Customers
433433
where !c.In(list)
434434
select c.Invoices;
@@ -462,7 +462,7 @@ public async Task QueryableStructContainsAsyncTest()
462462
.Select(c => c.Address);
463463
var query = (await (from c in Session.Query.All<Customer>()
464464
where !c.Address.In(list)
465-
select c.Invoices).AsAsync()).ToList();
465+
select c.Invoices).ExecuteAsync()).ToList();
466466
var expected = from c in Customers
467467
where !c.Address.In(list)
468468
select c.Invoices;
@@ -489,7 +489,7 @@ public async Task QueryableAnonimousContainsAsyncTest()
489489
var query = (await Session.Query.All<Customer>()
490490
.Where(c => new { c.FirstName }.In(list))
491491
.Select(c => c.Invoices)
492-
.AsAsync()).ToList();
492+
.ExecuteAsync()).ToList();
493493
var expected = Customers.Where(c => new { c.FirstName }.In(list)).Select(c => c.Invoices);
494494
Assert.That(query, Is.Not.Empty);
495495
Assert.AreEqual(0, expected.Except(query).Count());
@@ -527,7 +527,7 @@ public async Task ComplexCondition1AsyncTest()
527527
var list = new List<int> { 276192, 349492, 232463 };
528528
var query = (await (from track in Session.Query.All<Track>()
529529
where track.Milliseconds.In(includeAlgorithm, list)
530-
select track).AsAsync()).ToList();
530+
select track).ExecuteAsync()).ToList();
531531
var expected = from track in Tracks
532532
where track.Milliseconds.In(includeAlgorithm, list)
533533
select track;
@@ -557,7 +557,7 @@ public async Task ComplexCondition2AsyncTest()
557557
var includeAlgorithm = IncludeAlgorithm.TemporaryTable;
558558
var query = (await (from track in Session.Query.All<Track>()
559559
where track.Milliseconds.In(includeAlgorithm, 276192, 349492, 232463)
560-
select track).AsAsync()).ToList();
560+
select track).ExecuteAsync()).ToList();
561561
var expected = from track in Tracks
562562
where track.Milliseconds.In(includeAlgorithm, 276192, 349492, 232463)
563563
select track;

Orm/Xtensive.Orm.Tests/Linq/LocalCollectionsTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -889,7 +889,7 @@ public async Task Aggregate2AsyncTest()
889889
var localItems = GetLocalItems(100);
890890
var queryable = Session.Query.Store(localItems);
891891
var result = (await Session.Query.All<Invoice>()
892-
.Where(invoice => invoice.Commission > queryable.Max(poco => poco.Value2)).AsAsync()).ToList();
892+
.Where(invoice => invoice.Commission > queryable.Max(poco => poco.Value2)).ExecuteAsync()).ToList();
893893
var expected = Invoices
894894
.Where(invoice => invoice.Commission > localItems.Max(poco => poco.Value2));
895895

Orm/Xtensive.Orm.Tests/Linq/QueryMethodTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public async Task Store1AsyncTest()
131131
Session.Query.Store(localCustomers),
132132
customer => customer,
133133
localCustomer => localCustomer,
134-
(customer, localCustomer) => new { customer, localCustomer }).AsAsync()).ToList();
134+
(customer, localCustomer) => new { customer, localCustomer }).ExecuteAsync()).ToList();
135135
var expected = Session.Query.All<Customer>().AsEnumerable()
136136
.Join(
137137
Session.Query.Store(localCustomers),
@@ -175,7 +175,7 @@ public async Task Store2AsyncTest()
175175
Session.Query.Store(Session.Query.All<Customer>().Take(10)),
176176
customer => customer,
177177
localCustomer => localCustomer,
178-
(customer, localCustomer) => new { customer, localCustomer }).AsAsync()).ToList();
178+
(customer, localCustomer) => new { customer, localCustomer }).ExecuteAsync()).ToList();
179179
var expected = Session.Query.All<Customer>().AsEnumerable()
180180
.Join(
181181
Session.Query.Store(Session.Query.All<Customer>().Take(10)),

Orm/Xtensive.Orm.Tests/Storage/CommandProcessing/BatchingCommandProcessorParametersManagement.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ public async Task PartialExecutionAllowedAsyncTest01()
904904

905905
counter.Reset();
906906
using (counter.Attach()) {
907-
var result = (await session.Query.All<ALotOfFieldsEntityValid>().AsAsync()).ToArray().Length;
907+
var result = (await session.Query.All<ALotOfFieldsEntityValid>().ExecuteAsync()).ToArray().Length;
908908
Assert.That(result, Is.EqualTo(countBefore + 3));
909909
}
910910

@@ -972,7 +972,7 @@ public async Task PartialExecutionAllowedAsyncTest02()
972972
Assert.That(counter.Count, Is.EqualTo(1));
973973
counter.Reset();
974974
using (counter.Attach()) {
975-
var result = (await session.Query.All<NormalAmountOfFieldsEntity>().AsAsync()).ToArray().Length;
975+
var result = (await session.Query.All<NormalAmountOfFieldsEntity>().ExecuteAsync()).ToArray().Length;
976976
Assert.That(result, Is.EqualTo(batchSize + 1));
977977
}
978978
Assert.That(counter.Count, Is.EqualTo(1));
@@ -1028,7 +1028,7 @@ public async Task PartialExecutionAllowedAsyncTest03()
10281028

10291029
//persist by query causes allowPartialExecution = true;
10301030
using (counter.Attach()) {
1031-
var result = (await session.Query.All<NormalAmountOfFieldsEntity>().AsAsync()).ToArray();
1031+
var result = (await session.Query.All<NormalAmountOfFieldsEntity>().ExecuteAsync()).ToArray();
10321032
Assert.That(result.Length, Is.EqualTo(batchSize + 1));
10331033
}
10341034
Assert.That(counter.Count, Is.EqualTo(2));
@@ -1086,7 +1086,7 @@ public async Task PartialExecutionAllowedAsyncTest04()
10861086

10871087
//persist by query causes allowPartialExecution = true;
10881088
using (counter.Attach()) {
1089-
var result = (await session.Query.All<NormalAmountOfFieldsEntity>().AsAsync()).ToArray();
1089+
var result = (await session.Query.All<NormalAmountOfFieldsEntity>().ExecuteAsync()).ToArray();
10901090
Assert.That(result.Length, Is.EqualTo(batchSize + 1));
10911091
}
10921092
Assert.That(counter.Count, Is.EqualTo(2));

0 commit comments

Comments
 (0)