From 6139deee6c1574cd1004a2595df78d60e5eccd02 Mon Sep 17 00:00:00 2001 From: maca88 Date: Fri, 24 Apr 2020 20:45:37 +0200 Subject: [PATCH] Upgrade AsyncGenerator to 0.18.2 --- Tools/packages.csproj | 2 +- .../Async/Futures/FutureCriteriaFixture.cs | 32 +-- .../Async/Linq/MiscellaneousTextFixture.cs | 30 +-- src/NHibernate.Test/Async/Linq/QueryLock.cs | 16 +- .../NH2322/PostUpdateEventListener.cs | 6 +- .../Async/NHSpecificTest/NH2500/Fixture.cs | 26 +-- .../NH2898/BinaryFormatterCache.cs | 12 +- .../NH3848/CriteriaTestFixture.cs | 120 +++++------ .../NHSpecificTest/NH3848/HqlTestFixture.cs | 32 +-- .../NH3848/QueryOverTestFixture.cs | 186 +++++++++--------- .../NHSpecificTest/NH3918/FixtureByCode.cs | 8 +- .../Async/ProjectionFixtures/Fixture.cs | 32 +-- .../Async/AdoNet/HanaBatchingBatcher.cs | 6 +- .../AdoNet/OracleDataClientBatchingBatcher.cs | 6 +- .../Async/Cache/ICacheConcurrencyStrategy.cs | 4 +- src/NHibernate/Async/Cache/IQueryCache.cs | 16 +- .../Async/Cache/UpdateTimestampsCache.cs | 4 +- .../Dialect/Lock/UpdateLockingStrategy.cs | 14 +- src/NHibernate/Async/Engine/Collections.cs | 4 +- .../Async/Impl/SessionFactoryImpl.cs | 4 +- src/NHibernate/Async/Loader/Loader.cs | 2 +- .../Entity/AbstractEntityPersister.cs | 42 ++-- .../Async/Persister/Entity/ILoadable.cs | 6 +- .../Tool/hbm2ddl/SchemaMetadataUpdater.cs | 4 +- .../Transaction/AdoNetTransactionFactory.cs | 16 +- 25 files changed, 315 insertions(+), 315 deletions(-) diff --git a/Tools/packages.csproj b/Tools/packages.csproj index 2de5cb6eed4..0bdec320248 100644 --- a/Tools/packages.csproj +++ b/Tools/packages.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/NHibernate.Test/Async/Futures/FutureCriteriaFixture.cs b/src/NHibernate.Test/Async/Futures/FutureCriteriaFixture.cs index 374ff186bc6..db61d3313fa 100644 --- a/src/NHibernate.Test/Async/Futures/FutureCriteriaFixture.cs +++ b/src/NHibernate.Test/Async/Futures/FutureCriteriaFixture.cs @@ -64,30 +64,30 @@ public async Task CanUseFutureCriteriaAsync() [Test] public async Task TwoFuturesRunInTwoRoundTripsAsync() - { - using (var s = Sfi.OpenSession()) - { - IgnoreThisTestIfMultipleQueriesArentSupportedByDriver(); - - using (var logSpy = new SqlLogSpy()) - { - var persons10 = s.CreateCriteria(typeof(Person)) + { + using (var s = Sfi.OpenSession()) + { + IgnoreThisTestIfMultipleQueriesArentSupportedByDriver(); + + using (var logSpy = new SqlLogSpy()) + { + var persons10 = s.CreateCriteria(typeof(Person)) .SetMaxResults(10) .Future(); - foreach (var person in await (persons10.GetEnumerableAsync())) { } // fire first future round-trip + foreach (var person in await (persons10.GetEnumerableAsync())) { } // fire first future round-trip - var persons5 = s.CreateCriteria(typeof(Person)) + var persons5 = s.CreateCriteria(typeof(Person)) .SetMaxResults(5) .Future(); - foreach (var person in await (persons5.GetEnumerableAsync())) { } // fire second future round-trip + foreach (var person in await (persons5.GetEnumerableAsync())) { } // fire second future round-trip - var events = logSpy.Appender.GetEvents(); - Assert.AreEqual(2, events.Length); - } - } - } + var events = logSpy.Appender.GetEvents(); + Assert.AreEqual(2, events.Length); + } + } + } [Test] public async Task CanCombineSingleFutureValueWithEnumerableFuturesAsync() diff --git a/src/NHibernate.Test/Async/Linq/MiscellaneousTextFixture.cs b/src/NHibernate.Test/Async/Linq/MiscellaneousTextFixture.cs index 588d8e112ee..883651c9da1 100644 --- a/src/NHibernate.Test/Async/Linq/MiscellaneousTextFixture.cs +++ b/src/NHibernate.Test/Async/Linq/MiscellaneousTextFixture.cs @@ -26,14 +26,14 @@ public class MiscellaneousTextFixtureAsync : LinqTestCase [Category("COUNT/SUM/MIN/MAX/AVG")] [Test(Description = "This sample uses Count to find the number of Orders placed before yesterday in the database.")] public async Task CountWithWhereClauseAsync() - { - var yesterday = DateTime.Today.AddDays(-1); - var q = from o in db.Orders where o.OrderDate <= yesterday select o; + { + var yesterday = DateTime.Today.AddDays(-1); + var q = from o in db.Orders where o.OrderDate <= yesterday select o; - var count = await (q.CountAsync()); + var count = await (q.CountAsync()); - Console.WriteLine(count); - } + Console.WriteLine(count); + } [Category("From NHUser list")] [Test(Description = "Telerik grid example, http://www.telerik.com/community/forums/aspnet-mvc/grid/grid-and-nhibernate-linq.aspx")] @@ -137,17 +137,17 @@ orderby p.ProductId [Test] public async Task SelectFromObjectAsync() - { - using (var s = OpenSession()) - { - var hql = await (s.CreateQuery("from System.Object o").ListAsync()); + { + using (var s = OpenSession()) + { + var hql = await (s.CreateQuery("from System.Object o").ListAsync()); - var r = from o in s.Query() select o; + var r = from o in s.Query() select o; - var l = await (r.ToListAsync()); + var l = await (r.ToListAsync()); - Assert.AreEqual(hql.Count, l.Count); - } - } + Assert.AreEqual(hql.Count, l.Count); + } + } } } diff --git a/src/NHibernate.Test/Async/Linq/QueryLock.cs b/src/NHibernate.Test/Async/Linq/QueryLock.cs index 5da649d48ba..bcbc069c3cc 100644 --- a/src/NHibernate.Test/Async/Linq/QueryLock.cs +++ b/src/NHibernate.Test/Async/Linq/QueryLock.cs @@ -210,18 +210,18 @@ orderby e.CompanyName { // TODO: We should try to verify that the exception actually IS a locking failure and not something unrelated. Assert.ThrowsAsync( - async () => + async () => { var result2 = await (( - from e in s2.Query() - where e.CustomerId == customerId - select e - ).WithLock(LockMode.UpgradeNoWait) - .WithOptions(o => o.SetTimeout(5)) - .ToListAsync(cancellationToken)); + from e in s2.Query() + where e.CustomerId == customerId + select e + ).WithLock(LockMode.UpgradeNoWait) + .WithOptions(o => o.SetTimeout(5)) + .ToListAsync(cancellationToken)); Assert.That(result2, Is.Not.Null); }, - "Expected an exception to indicate locking failure due to already locked."); + "Expected an exception to indicate locking failure due to already locked."); } return Task.CompletedTask; } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2322/PostUpdateEventListener.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2322/PostUpdateEventListener.cs index 67960f24cd7..a91b7cf9e75 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2322/PostUpdateEventListener.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2322/PostUpdateEventListener.cs @@ -26,9 +26,9 @@ Task IPostUpdateEventListener.OnPostUpdateAsync(PostUpdateEvent @event, Cancella if (@event.Entity is Person) { return @event.Session - .CreateSQLQuery("update Person set Name = :newName") - .SetString("newName", "new updated name") - .ExecuteUpdateAsync(cancellationToken); + .CreateSQLQuery("update Person set Name = :newName") + .SetString("newName", "new updated name") + .ExecuteUpdateAsync(cancellationToken); } return Task.CompletedTask; } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2500/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2500/Fixture.cs index ffade9a06f2..f4fb100583d 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2500/Fixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2500/Fixture.cs @@ -62,13 +62,13 @@ protected override void OnTearDown() [Test] public async Task TestLinqProjectionExpressionDoesntCacheParametersAsync() - { - using (ISession session = Sfi.OpenSession()) - using (ITransaction transaction = session.BeginTransaction()) { - this.count = 1; + using (ISession session = Sfi.OpenSession()) + using (ITransaction transaction = session.BeginTransaction()) + { + this.count = 1; - var foos1 = await (session.Query() + var foos1 = await (session.Query() .Where(x => x.Name == "Banana") .Select(x => new { @@ -77,9 +77,9 @@ public async Task TestLinqProjectionExpressionDoesntCacheParametersAsync() User = "abc" }).FirstAsync()); - this.count = 2; + this.count = 2; - var foos2 = await (session.Query() + var foos2 = await (session.Query() .Where(x => x.Name == "Egg") .Select(x => new { @@ -88,13 +88,13 @@ public async Task TestLinqProjectionExpressionDoesntCacheParametersAsync() User = "def" }).FirstAsync()); -Assert.AreEqual(1, foos1.count); -Assert.AreEqual(2, foos2.count); -Assert.AreEqual("abc", foos1.User); -Assert.AreEqual("def", foos2.User); + Assert.AreEqual(1, foos1.count); + Assert.AreEqual(2, foos2.count); + Assert.AreEqual("abc", foos1.User); + Assert.AreEqual("def", foos2.User); - await (transaction.CommitAsync()); + await (transaction.CommitAsync()); + } } } - } } diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH2898/BinaryFormatterCache.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH2898/BinaryFormatterCache.cs index ef42a49d254..c32fcb0ef0c 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH2898/BinaryFormatterCache.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH2898/BinaryFormatterCache.cs @@ -32,11 +32,11 @@ public override Task GetAsync(object key, CancellationToken cancellation return Task.FromResult(null); var fmt = new BinaryFormatter - { + { #if !NETFX - SurrogateSelector = new SerializationHelper.SurrogateSelector() + SurrogateSelector = new SerializationHelper.SurrogateSelector() #endif - }; + }; using (var stream = new MemoryStream(entry)) { return Task.FromResult(fmt.Deserialize(stream)); @@ -53,11 +53,11 @@ public override Task PutAsync(object key, object value, CancellationToken cancel try { var fmt = new BinaryFormatter - { + { #if !NETFX - SurrogateSelector = new SerializationHelper.SurrogateSelector() + SurrogateSelector = new SerializationHelper.SurrogateSelector() #endif - }; + }; using (var stream = new MemoryStream()) { fmt.Serialize(stream, value); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3848/CriteriaTestFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3848/CriteriaTestFixture.cs index 3955fe3e783..766c7f8307a 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3848/CriteriaTestFixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3848/CriteriaTestFixture.cs @@ -24,11 +24,11 @@ public class CriteriaTestFixtureAsync : FixtureAsync try { return - session - .CreateCriteria() - .Fetch("Orders") - .SetResultTransformer(new DistinctRootEntityResultTransformer()) - .ListAsync(cancellationToken); + session + .CreateCriteria() + .Fetch("Orders") + .SetResultTransformer(new DistinctRootEntityResultTransformer()) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -41,10 +41,10 @@ public class CriteriaTestFixtureAsync : FixtureAsync try { return - session - .CreateCriteria() - .CreateAlias("Orders", "order", JoinType.LeftOuterJoin, Restrictions.Eq("Number", orderNumber)) - .ListAsync(cancellationToken); + session + .CreateCriteria() + .CreateAlias("Orders", "order", JoinType.LeftOuterJoin, Restrictions.Eq("Number", orderNumber)) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -57,11 +57,11 @@ public class CriteriaTestFixtureAsync : FixtureAsync try { return - session - .CreateCriteria() - .CreateAlias("Orders", "order", JoinType.InnerJoin, Restrictions.Eq("Number", orderNumber)) - .Fetch(SelectMode.Fetch, "Orders") - .ListAsync(cancellationToken); + session + .CreateCriteria() + .CreateAlias("Orders", "order", JoinType.InnerJoin, Restrictions.Eq("Number", orderNumber)) + .Fetch(SelectMode.Fetch, "Orders") + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -74,12 +74,12 @@ public class CriteriaTestFixtureAsync : FixtureAsync try { return - session - .CreateCriteria() - .Fetch(SelectMode.Fetch, "Orders") - .CreateCriteria("Orders", JoinType.InnerJoin) - .Add(Restrictions.Eq("Number", orderNumber)) - .ListAsync(cancellationToken); + session + .CreateCriteria() + .Fetch(SelectMode.Fetch, "Orders") + .CreateCriteria("Orders", JoinType.InnerJoin) + .Add(Restrictions.Eq("Number", orderNumber)) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -92,12 +92,12 @@ public class CriteriaTestFixtureAsync : FixtureAsync try { return - session - .CreateCriteria() - .CreateAlias("Orders", "order", JoinType.InnerJoin, Restrictions.Eq("Number", orderNumber)) - .Fetch(SelectMode.Fetch, "Orders") - .CreateAlias("Companies", "company", JoinType.LeftOuterJoin, Restrictions.Eq("Name", name)) - .ListAsync(cancellationToken); + session + .CreateCriteria() + .CreateAlias("Orders", "order", JoinType.InnerJoin, Restrictions.Eq("Number", orderNumber)) + .Fetch(SelectMode.Fetch, "Orders") + .CreateAlias("Companies", "company", JoinType.LeftOuterJoin, Restrictions.Eq("Name", name)) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -110,12 +110,12 @@ public class CriteriaTestFixtureAsync : FixtureAsync try { return - session - .CreateCriteria() - .Fetch(SelectMode.Fetch, "Orders") - .CreateAlias("Orders", "order", JoinType.InnerJoin) - .CreateAlias("Companies", "company", JoinType.LeftOuterJoin) - .ListAsync(cancellationToken); + session + .CreateCriteria() + .Fetch(SelectMode.Fetch, "Orders") + .CreateAlias("Orders", "order", JoinType.InnerJoin) + .CreateAlias("Companies", "company", JoinType.LeftOuterJoin) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -130,11 +130,11 @@ protected override Task> GetCustomersWithCompaniesByOrderNumberU try { return - session - .CreateCriteria() - .CreateAlias("Orders", "order", JoinType.LeftOuterJoin, Restrictions.Eq("Number", orderNumber)) - .CreateAlias("Companies", "company", JoinType.LeftOuterJoin) - .ListAsync(cancellationToken); + session + .CreateCriteria() + .CreateAlias("Orders", "order", JoinType.LeftOuterJoin, Restrictions.Eq("Number", orderNumber)) + .CreateAlias("Companies", "company", JoinType.LeftOuterJoin) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -147,12 +147,12 @@ protected override Task> GetCustomersWithCompaniesByOrderNumberU try { return - session - .CreateCriteria() - .CreateCriteria("Orders", "Order", JoinType.LeftOuterJoin) - .Add(Restrictions.Eq("Number", orderNumber)) - .SetResultTransformer(new DistinctRootEntityResultTransformer()) - .ListAsync(cancellationToken); + session + .CreateCriteria() + .CreateCriteria("Orders", "Order", JoinType.LeftOuterJoin) + .Add(Restrictions.Eq("Number", orderNumber)) + .SetResultTransformer(new DistinctRootEntityResultTransformer()) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -165,12 +165,12 @@ protected override Task> GetCustomersWithCompaniesByOrderNumberU try { return - session - .CreateCriteria() - .CreateAlias("Orders", "order", JoinType.LeftOuterJoin) - .Add(Restrictions.Eq("Name", "First Customer")) - .SetResultTransformer(new DistinctRootEntityResultTransformer()) - .ListAsync(cancellationToken); + session + .CreateCriteria() + .CreateAlias("Orders", "order", JoinType.LeftOuterJoin) + .Add(Restrictions.Eq("Name", "First Customer")) + .SetResultTransformer(new DistinctRootEntityResultTransformer()) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -186,19 +186,19 @@ protected override Task> GetCustomersByOrderNumberUsingSubquerie try { var detachedCriteria = - DetachedCriteria - .For() - .CreateAlias("Orders", "order", JoinType.LeftOuterJoin, Restrictions.Eq("Number", orderNumber)) - .SetProjection(Projections.Id()); + DetachedCriteria + .For() + .CreateAlias("Orders", "order", JoinType.LeftOuterJoin, Restrictions.Eq("Number", orderNumber)) + .SetProjection(Projections.Id()); return - session - .CreateCriteria() - .CreateAlias("Orders", "order1", JoinType.LeftOuterJoin) - .Add(Subqueries.PropertyIn("Id", detachedCriteria)) - .Add(Restrictions.Eq("Name", customerName)) - .SetResultTransformer(new DistinctRootEntityResultTransformer()) - .ListAsync(cancellationToken); + session + .CreateCriteria() + .CreateAlias("Orders", "order1", JoinType.LeftOuterJoin) + .Add(Subqueries.PropertyIn("Id", detachedCriteria)) + .Add(Restrictions.Eq("Name", customerName)) + .SetResultTransformer(new DistinctRootEntityResultTransformer()) + .ListAsync(cancellationToken); } catch (System.Exception ex) { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3848/HqlTestFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3848/HqlTestFixture.cs index 6f7588dc11a..0afaaf8dd33 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3848/HqlTestFixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3848/HqlTestFixture.cs @@ -68,9 +68,9 @@ public override Task ChildCollectionsWithSelectModeFetchOnCollectionShouldNotBeI try { var query = session.CreateQuery( - "from Customer as c " + - "left join fetch c.Orders as o " + - "where o.Number = :number"); + "from Customer as c " + + "left join fetch c.Orders as o " + + "where o.Number = :number"); query.SetParameter("number", orderNumber); return query.ListAsync(cancellationToken); } @@ -85,9 +85,9 @@ public override Task ChildCollectionsWithSelectModeFetchOnCollectionShouldNotBeI try { var query = session.CreateQuery( - "from Customer as c " + - "left join fetch c.Orders as o " + - "where c.Name = :name"); + "from Customer as c " + + "left join fetch c.Orders as o " + + "where c.Name = :name"); query.SetParameter("name", customerName); query.SetResultTransformer(new DistinctRootEntityResultTransformer()); return query.ListAsync(cancellationToken); @@ -109,9 +109,9 @@ public override Task ChildCollectionsWithSelectModeFetchOnCollectionShouldNotBeI try { var query = session.CreateQuery( - "from Customer as c " + - "inner join fetch c.Orders as o " + - "where o.Number = :number"); + "from Customer as c " + + "inner join fetch c.Orders as o " + + "where o.Number = :number"); query.SetParameter("number", orderNumber); return query.ListAsync(cancellationToken); } @@ -132,9 +132,9 @@ public override Task ChildCollectionsWithSelectModeFetchOnCollectionShouldNotBeI try { var query = session.CreateQuery( - "from Customer as c " + - "inner join fetch c.Orders as o " + - "left join fetch c.Companies as cmp"); + "from Customer as c " + + "inner join fetch c.Orders as o " + + "left join fetch c.Companies as cmp"); return query.ListAsync(cancellationToken); } catch (Exception ex) @@ -148,10 +148,10 @@ public override Task ChildCollectionsWithSelectModeFetchOnCollectionShouldNotBeI try { var query = session.CreateQuery( - "from Customer as c " + - "left join fetch c.Orders as o " + - "where c.Name = :name and " + - "c.Id in (select c1.Id from Customer as c1 left join c1.Orders as o2 where o2.Number = :number)"); + "from Customer as c " + + "left join fetch c.Orders as o " + + "where c.Name = :name and " + + "c.Id in (select c1.Id from Customer as c1 left join c1.Orders as o2 where o2.Number = :number)"); query.SetParameter("name", customerName); query.SetParameter("number", orderNumber); query.SetResultTransformer(new DistinctRootEntityResultTransformer()); diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3848/QueryOverTestFixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3848/QueryOverTestFixture.cs index d38763a2748..83150da3a8d 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3848/QueryOverTestFixture.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3848/QueryOverTestFixture.cs @@ -24,11 +24,11 @@ public class QueryOverTestFixtureAsync : FixtureAsync try { return - session - .QueryOver() - .Fetch(SelectMode.Fetch, n => n.Orders) - .TransformUsing(new DistinctRootEntityResultTransformer()) - .ListAsync(cancellationToken); + session + .QueryOver() + .Fetch(SelectMode.Fetch, n => n.Orders) + .TransformUsing(new DistinctRootEntityResultTransformer()) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -42,14 +42,14 @@ public class QueryOverTestFixtureAsync : FixtureAsync { Order ordersAlias = null; return - session - .QueryOver() - .JoinAlias( - n => n.Orders, - () => ordersAlias, - JoinType.LeftOuterJoin, - Restrictions.Eq("Number", orderNumber)) - .ListAsync(cancellationToken); + session + .QueryOver() + .JoinAlias( + n => n.Orders, + () => ordersAlias, + JoinType.LeftOuterJoin, + Restrictions.Eq("Number", orderNumber)) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -64,12 +64,12 @@ public class QueryOverTestFixtureAsync : FixtureAsync Order ordersAlias = null; return - session - .QueryOver() - .JoinQueryOver(ec => ec.Orders, () => ordersAlias, JoinType.InnerJoin, Restrictions.Eq("Number", orderNumber)) - .Fetch(SelectMode.Fetch, () => ordersAlias) - .TransformUsing(Transformers.DistinctRootEntity) - .ListAsync(cancellationToken); + session + .QueryOver() + .JoinQueryOver(ec => ec.Orders, () => ordersAlias, JoinType.InnerJoin, Restrictions.Eq("Number", orderNumber)) + .Fetch(SelectMode.Fetch, () => ordersAlias) + .TransformUsing(Transformers.DistinctRootEntity) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -84,13 +84,13 @@ public class QueryOverTestFixtureAsync : FixtureAsync Order ordersAlias = null; return - session - .QueryOver() - .JoinQueryOver(ec => ec.Orders, () => ordersAlias, JoinType.InnerJoin) - .Where(Restrictions.Eq("Number", orderNumber)) - .Fetch(SelectMode.Fetch, () => ordersAlias) - .TransformUsing(Transformers.DistinctRootEntity) - .ListAsync(cancellationToken); + session + .QueryOver() + .JoinQueryOver(ec => ec.Orders, () => ordersAlias, JoinType.InnerJoin) + .Where(Restrictions.Eq("Number", orderNumber)) + .Fetch(SelectMode.Fetch, () => ordersAlias) + .TransformUsing(Transformers.DistinctRootEntity) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -106,20 +106,20 @@ public class QueryOverTestFixtureAsync : FixtureAsync Company companiesAlias = null; return - session - .QueryOver() - .JoinAlias( - n => n.Orders, - () => ordersAlias, - JoinType.InnerJoin, - Restrictions.Eq("Number", orderNumber)) - .Fetch(SelectMode.Fetch, () => ordersAlias) - .JoinAlias( - n => n.Companies, - () => companiesAlias, - JoinType.LeftOuterJoin, - Restrictions.Eq("Name", name)) - .ListAsync(cancellationToken); + session + .QueryOver() + .JoinAlias( + n => n.Orders, + () => ordersAlias, + JoinType.InnerJoin, + Restrictions.Eq("Number", orderNumber)) + .Fetch(SelectMode.Fetch, () => ordersAlias) + .JoinAlias( + n => n.Companies, + () => companiesAlias, + JoinType.LeftOuterJoin, + Restrictions.Eq("Name", name)) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -135,18 +135,18 @@ public class QueryOverTestFixtureAsync : FixtureAsync Company companiesAlias = null; return - session - .QueryOver() - .JoinAlias( - n => n.Orders, - () => ordersAlias, - JoinType.InnerJoin) - .Fetch(SelectMode.Fetch, () => ordersAlias) - .JoinAlias( - n => n.Companies, - () => companiesAlias, - JoinType.LeftOuterJoin) - .ListAsync(cancellationToken); + session + .QueryOver() + .JoinAlias( + n => n.Orders, + () => ordersAlias, + JoinType.InnerJoin) + .Fetch(SelectMode.Fetch, () => ordersAlias) + .JoinAlias( + n => n.Companies, + () => companiesAlias, + JoinType.LeftOuterJoin) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -164,18 +164,18 @@ protected override Task> GetCustomersWithCompaniesByOrderNumberU Company companiesAlias = null; return - session - .QueryOver() - .JoinAlias( - n => n.Orders, - () => ordersAlias, - JoinType.LeftOuterJoin, - Restrictions.Eq("Number", orderNumber)) - .JoinAlias( - n => n.Companies, - () => companiesAlias, - JoinType.LeftOuterJoin) - .ListAsync(cancellationToken); + session + .QueryOver() + .JoinAlias( + n => n.Orders, + () => ordersAlias, + JoinType.LeftOuterJoin, + Restrictions.Eq("Number", orderNumber)) + .JoinAlias( + n => n.Companies, + () => companiesAlias, + JoinType.LeftOuterJoin) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -189,11 +189,11 @@ protected override Task> GetCustomersWithCompaniesByOrderNumberU { Order ordersAlias = null; return - session - .QueryOver() - .JoinQueryOver(n => n.Orders, () => ordersAlias, JoinType.LeftOuterJoin) - .Where(Restrictions.Eq("Number", orderNumber)) - .ListAsync(cancellationToken); + session + .QueryOver() + .JoinQueryOver(n => n.Orders, () => ordersAlias, JoinType.LeftOuterJoin) + .Where(Restrictions.Eq("Number", orderNumber)) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -207,15 +207,15 @@ protected override Task> GetCustomersWithCompaniesByOrderNumberU { Order ordersAlias = null; return - session - .QueryOver() - .JoinAlias( - n => n.Orders, - () => ordersAlias, - JoinType.LeftOuterJoin) - .Where(Restrictions.Eq("Name", customerName)) - .TransformUsing(new DistinctRootEntityResultTransformer()) - .ListAsync(cancellationToken); + session + .QueryOver() + .JoinAlias( + n => n.Orders, + () => ordersAlias, + JoinType.LeftOuterJoin) + .Where(Restrictions.Eq("Name", customerName)) + .TransformUsing(new DistinctRootEntityResultTransformer()) + .ListAsync(cancellationToken); } catch (System.Exception ex) { @@ -233,23 +233,23 @@ protected override Task> GetCustomersByOrderNumberUsingSubquerie Order ordersAlias = null; Order ordersAlias2 = null; var subquery = - QueryOver - .Of() - .JoinAlias( - n => n.Orders, - () => ordersAlias, - JoinType.LeftOuterJoin, - Restrictions.Eq("Number", orderNumber)) - .Select(n => n.Id); + QueryOver + .Of() + .JoinAlias( + n => n.Orders, + () => ordersAlias, + JoinType.LeftOuterJoin, + Restrictions.Eq("Number", orderNumber)) + .Select(n => n.Id); return - session - .QueryOver() - .JoinAlias(n => n.Orders, () => ordersAlias2, JoinType.LeftOuterJoin) - .WithSubquery.WhereProperty(n => n.Id).In(subquery) - .Where(Restrictions.Eq("Name", customerName)) - .TransformUsing(new DistinctRootEntityResultTransformer()) - .ListAsync(cancellationToken); + session + .QueryOver() + .JoinAlias(n => n.Orders, () => ordersAlias2, JoinType.LeftOuterJoin) + .WithSubquery.WhereProperty(n => n.Id).In(subquery) + .Where(Restrictions.Eq("Name", customerName)) + .TransformUsing(new DistinctRootEntityResultTransformer()) + .ListAsync(cancellationToken); } catch (System.Exception ex) { diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3918/FixtureByCode.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3918/FixtureByCode.cs index 0c62dbf30a2..4f1a9e26e03 100644 --- a/src/NHibernate.Test/Async/NHSpecificTest/NH3918/FixtureByCode.cs +++ b/src/NHibernate.Test/Async/NHSpecificTest/NH3918/FixtureByCode.cs @@ -84,10 +84,10 @@ protected Owner CreateOwner(ISession session, string name) try { var t = new Entity - { - Name = name, - Owner = owner, - }; + { + Name = name, + Owner = owner, + }; return session.SaveAsync(t, cancellationToken); } catch (Exception ex) diff --git a/src/NHibernate.Test/Async/ProjectionFixtures/Fixture.cs b/src/NHibernate.Test/Async/ProjectionFixtures/Fixture.cs index 420b86e42fd..5069ff607f6 100644 --- a/src/NHibernate.Test/Async/ProjectionFixtures/Fixture.cs +++ b/src/NHibernate.Test/Async/ProjectionFixtures/Fixture.cs @@ -116,10 +116,10 @@ public void ErrorFromDBWillGiveTheActualSQLExecutedAsync() [Test] public async Task AggregatingHirearchyWithCountAsync() - { - var root = new Key {Id = 1, Area = 2}; + { + var root = new Key {Id = 1, Area = 2}; - DetachedCriteria projection = DetachedCriteria.For("child") + DetachedCriteria projection = DetachedCriteria.For("child") .Add(Restrictions.Eq("Parent.id", root)) .Add(Restrictions.Gt("Key.Id", 0)) .Add(Restrictions.Eq("Type", NodeType.Blue)) @@ -131,19 +131,19 @@ public async Task AggregatingHirearchyWithCountAsync() .Add(Projections.Count(Projections.Property("grandchild.Key.Id"))) ); - using(var s = Sfi.OpenSession()) - using(var tx = s.BeginTransaction()) - { - var criteria = projection.GetExecutableCriteria(s); - var list = await (criteria.ListAsync()); - Assert.AreEqual(1, list.Count); - var tuple = (object[]) list[0]; - Assert.AreEqual(11, tuple[0]); - Assert.AreEqual(2, tuple[1]); - Assert.AreEqual(1, tuple[2]); - await (tx.CommitAsync()); - } - } + using(var s = Sfi.OpenSession()) + using(var tx = s.BeginTransaction()) + { + var criteria = projection.GetExecutableCriteria(s); + var list = await (criteria.ListAsync()); + Assert.AreEqual(1, list.Count); + var tuple = (object[]) list[0]; + Assert.AreEqual(11, tuple[0]); + Assert.AreEqual(2, tuple[1]); + Assert.AreEqual(1, tuple[2]); + await (tx.CommitAsync()); + } + } [Test] public async Task LimitingResultSetOnQueryThatIsOrderedByProjectionAsync() diff --git a/src/NHibernate/Async/AdoNet/HanaBatchingBatcher.cs b/src/NHibernate/Async/AdoNet/HanaBatchingBatcher.cs index 6deb4b255e9..0fd47edd571 100644 --- a/src/NHibernate/Async/AdoNet/HanaBatchingBatcher.cs +++ b/src/NHibernate/Async/AdoNet/HanaBatchingBatcher.cs @@ -48,9 +48,9 @@ async Task InternalAddToBatchAsync() var formatStyle = sqlStatementLogger.DetermineActualStyle(FormatStyle.Basic); lineWithParameters = formatStyle.Formatter.Format(lineWithParameters); _currentBatchCommandsLog.Append("command ") - .Append(_countOfCommands) - .Append(":") - .AppendLine(lineWithParameters); + .Append(_countOfCommands) + .Append(":") + .AppendLine(lineWithParameters); } if (Log.IsDebugEnabled()) { diff --git a/src/NHibernate/Async/AdoNet/OracleDataClientBatchingBatcher.cs b/src/NHibernate/Async/AdoNet/OracleDataClientBatchingBatcher.cs index 782e2cce4cd..d9363e2d2f3 100644 --- a/src/NHibernate/Async/AdoNet/OracleDataClientBatchingBatcher.cs +++ b/src/NHibernate/Async/AdoNet/OracleDataClientBatchingBatcher.cs @@ -40,9 +40,9 @@ public override Task AddToBatchAsync(IExpectation expectation, CancellationToken var formatStyle = sqlStatementLogger.DetermineActualStyle(FormatStyle.Basic); lineWithParameters = formatStyle.Formatter.Format(lineWithParameters); _currentBatchCommandsLog.Append("command ") - .Append(_countOfCommands) - .Append(":") - .AppendLine(lineWithParameters); + .Append(_countOfCommands) + .Append(":") + .AppendLine(lineWithParameters); } if (Log.IsDebugEnabled()) { diff --git a/src/NHibernate/Async/Cache/ICacheConcurrencyStrategy.cs b/src/NHibernate/Async/Cache/ICacheConcurrencyStrategy.cs index 9967ca2dca0..57ad9361beb 100644 --- a/src/NHibernate/Async/Cache/ICacheConcurrencyStrategy.cs +++ b/src/NHibernate/Async/Cache/ICacheConcurrencyStrategy.cs @@ -146,8 +146,8 @@ public static Task GetManyAsync(this ICacheConcurrencyStrategy cache, // PreferMultipleGet yields false if !IBatchableCacheConcurrencyStrategy, no GetMany call should be done // in such case. return ReflectHelper - .CastOrThrow(cache, "batching") - .GetManyAsync(keys, timestamp, cancellationToken); + .CastOrThrow(cache, "batching") + .GetManyAsync(keys, timestamp, cancellationToken); } catch (System.Exception ex) { diff --git a/src/NHibernate/Async/Cache/IQueryCache.cs b/src/NHibernate/Async/Cache/IQueryCache.cs index 5cb2aded412..531f3bf9e2e 100644 --- a/src/NHibernate/Async/Cache/IQueryCache.cs +++ b/src/NHibernate/Async/Cache/IQueryCache.cs @@ -192,19 +192,19 @@ public static Task PutAsync( if (queryCache is IBatchableQueryCache batchableQueryCache) { return batchableQueryCache.PutAsync( - key, queryParameters, - returnTypes, - result, session, cancellationToken); + key, queryParameters, + returnTypes, + result, session, cancellationToken); } #pragma warning disable 618 return queryCache.PutAsync( #pragma warning restore 618 - key, - returnTypes, - result, - queryParameters.NaturalKeyLookup, - session, cancellationToken); + key, + returnTypes, + result, + queryParameters.NaturalKeyLookup, + session, cancellationToken); } catch (Exception ex) { diff --git a/src/NHibernate/Async/Cache/UpdateTimestampsCache.cs b/src/NHibernate/Async/Cache/UpdateTimestampsCache.cs index 774c25bec75..2bfb9719618 100644 --- a/src/NHibernate/Async/Cache/UpdateTimestampsCache.cs +++ b/src/NHibernate/Async/Cache/UpdateTimestampsCache.cs @@ -113,8 +113,8 @@ private Task SetSpacesTimestampAsync(IReadOnlyCollection spaces, long ts try { return _updateTimestamps.PutManyAsync( - spaces.ToArray(), - ArrayHelper.Fill(ts, spaces.Count), cancellationToken); + spaces.ToArray(), + ArrayHelper.Fill(ts, spaces.Count), cancellationToken); } catch (Exception ex) { diff --git a/src/NHibernate/Async/Dialect/Lock/UpdateLockingStrategy.cs b/src/NHibernate/Async/Dialect/Lock/UpdateLockingStrategy.cs index 0d39ebf758f..4487f5944b4 100644 --- a/src/NHibernate/Async/Dialect/Lock/UpdateLockingStrategy.cs +++ b/src/NHibernate/Async/Dialect/Lock/UpdateLockingStrategy.cs @@ -78,13 +78,13 @@ async Task InternalLockAsync() catch (Exception sqle) { var exceptionContext = new AdoExceptionContextInfo - { - SqlException = sqle, - Message = "could not lock: " + MessageHelper.InfoString(lockable, id, factory), - Sql = sql.ToString(), - EntityName = lockable.EntityName, - EntityId = id - }; + { + SqlException = sqle, + Message = "could not lock: " + MessageHelper.InfoString(lockable, id, factory), + Sql = sql.ToString(), + EntityName = lockable.EntityName, + EntityId = id + }; throw ADOExceptionHelper.Convert(session.Factory.SQLExceptionConverter, exceptionContext); } } diff --git a/src/NHibernate/Async/Engine/Collections.cs b/src/NHibernate/Async/Engine/Collections.cs index 412316fe09d..6219e1c3320 100644 --- a/src/NHibernate/Async/Engine/Collections.cs +++ b/src/NHibernate/Async/Engine/Collections.cs @@ -203,13 +203,13 @@ private static Task PrepareCollectionForUpdateAsync(IPersistentCollection collec { // it is or was referenced _somewhere_ bool ownerChanged = loadedPersister != currentPersister || - !currentPersister.KeyType.IsEqual(entry.LoadedKey, entry.CurrentKey, factory); + !currentPersister.KeyType.IsEqual(entry.LoadedKey, entry.CurrentKey, factory); if (ownerChanged) { // do a check bool orphanDeleteAndRoleChanged = loadedPersister != null && - currentPersister != null && loadedPersister.HasOrphanDelete; + currentPersister != null && loadedPersister.HasOrphanDelete; if (orphanDeleteAndRoleChanged) { diff --git a/src/NHibernate/Async/Impl/SessionFactoryImpl.cs b/src/NHibernate/Async/Impl/SessionFactoryImpl.cs index 64f68c002aa..8fb68cb28cb 100644 --- a/src/NHibernate/Async/Impl/SessionFactoryImpl.cs +++ b/src/NHibernate/Async/Impl/SessionFactoryImpl.cs @@ -236,7 +236,7 @@ async Task InternalEvictEntityAsync() if (log.IsDebugEnabled()) { log.Debug("evicting second-level cache for: {0}", - string.Join(", ", cacheGroup.Select(p => p.EntityName))); + string.Join(", ", cacheGroup.Select(p => p.EntityName))); } await (cacheGroup.Key.ClearAsync(cancellationToken)).ConfigureAwait(false); } @@ -337,7 +337,7 @@ async Task InternalEvictCollectionAsync() if (log.IsDebugEnabled()) { log.Debug("evicting second-level cache for: {0}", - string.Join(", ", cacheGroup.Select(p => p.Role))); + string.Join(", ", cacheGroup.Select(p => p.Role))); } await (cacheGroup.Key.ClearAsync(cancellationToken)).ConfigureAwait(false); } diff --git a/src/NHibernate/Async/Loader/Loader.cs b/src/NHibernate/Async/Loader/Loader.cs index 6367dbd9711..a8a235d48c3 100644 --- a/src/NHibernate/Async/Loader/Loader.cs +++ b/src/NHibernate/Async/Loader/Loader.cs @@ -427,7 +427,7 @@ private Task EndCollectionLoadAsync(DbDataReader reader, ISessionImplementor ses { //this is a query and we are loading multiple instances of the same collection role return session.PersistenceContext.LoadContexts.GetCollectionLoadContext(reader).EndLoadingCollectionsAsync( - collectionPersister, !IsCollectionPersisterCacheable(collectionPersister), cacheBatcher, cancellationToken); + collectionPersister, !IsCollectionPersisterCacheable(collectionPersister), cacheBatcher, cancellationToken); } catch (Exception ex) { diff --git a/src/NHibernate/Async/Persister/Entity/AbstractEntityPersister.cs b/src/NHibernate/Async/Persister/Entity/AbstractEntityPersister.cs index a36c7b69f32..1d466b213e6 100644 --- a/src/NHibernate/Async/Persister/Entity/AbstractEntityPersister.cs +++ b/src/NHibernate/Async/Persister/Entity/AbstractEntityPersister.cs @@ -201,9 +201,9 @@ async Task InternalForceVersionIncrementAsync() if (log.IsDebugEnabled()) { log.Debug("Forcing version increment [{0}; {1} -> {2}]", - MessageHelper.InfoString(this, id, Factory), - VersionType.ToLoggableString(currentVersion, Factory), - VersionType.ToLoggableString(nextVersion, Factory)); + MessageHelper.InfoString(this, id, Factory), + VersionType.ToLoggableString(currentVersion, Factory), + VersionType.ToLoggableString(nextVersion, Factory)); } IExpectation expectation = Expectations.AppropriateExpectation(updateResultCheckStyles[0]); @@ -227,13 +227,13 @@ async Task InternalForceVersionIncrementAsync() catch (DbException sqle) { var exceptionContext = new AdoExceptionContextInfo - { - SqlException = sqle, - Message = "could not retrieve version: " + MessageHelper.InfoString(this, id, Factory), - Sql = VersionSelectString.ToString(), - EntityName = EntityName, - EntityId = id - }; + { + SqlException = sqle, + Message = "could not retrieve version: " + MessageHelper.InfoString(this, id, Factory), + Sql = VersionSelectString.ToString(), + EntityName = EntityName, + EntityId = id + }; throw ADOExceptionHelper.Convert(Factory.SQLExceptionConverter, exceptionContext); } return nextVersion; @@ -1388,9 +1388,9 @@ async Task InternalGetNaturalIdentifierSnapshotAsync() string[] aliasedIdColumns = StringHelper.Qualify(RootAlias, IdentifierColumnNames); SqlString whereClause = new SqlString( - SqlStringHelper.Join(new SqlString("=", Parameter.Placeholder, " and "), aliasedIdColumns), - "=", Parameter.Placeholder, - WhereJoinFragment(RootAlias, true, false)); + SqlStringHelper.Join(new SqlString("=", Parameter.Placeholder, " and "), aliasedIdColumns), + "=", Parameter.Placeholder, + WhereJoinFragment(RootAlias, true, false)); SqlString sql = select.SetOuterJoins(SqlString.Empty, SqlString.Empty).SetWhereClause(whereClause).ToStatementString(); /////////////////////////////////////////////////////////////////////// @@ -1414,7 +1414,7 @@ async Task InternalGetNaturalIdentifierSnapshotAsync() for (int i = 0; i < naturalIdPropertyCount; i++) { snapshot[i] = - await (extractionTypes[i].HydrateAsync(rs, GetPropertyAliases(string.Empty, naturalIdPropertyIndexes[i]), session, null, cancellationToken)).ConfigureAwait(false); + await (extractionTypes[i].HydrateAsync(rs, GetPropertyAliases(string.Empty, naturalIdPropertyIndexes[i]), session, null, cancellationToken)).ConfigureAwait(false); if (extractionTypes[i].IsEntityType) { snapshot[i] = await (extractionTypes[i].ResolveIdentifierAsync(snapshot[i], session, null, cancellationToken)).ConfigureAwait(false); @@ -1430,13 +1430,13 @@ async Task InternalGetNaturalIdentifierSnapshotAsync() catch (DbException sqle) { var exceptionContext = new AdoExceptionContextInfo - { - SqlException = sqle, - Message = "could not retrieve snapshot: " + MessageHelper.InfoString(this, id, Factory), - Sql = sql.ToString(), - EntityName = EntityName, - EntityId = id - }; + { + SqlException = sqle, + Message = "could not retrieve snapshot: " + MessageHelper.InfoString(this, id, Factory), + Sql = sql.ToString(), + EntityName = EntityName, + EntityId = id + }; throw ADOExceptionHelper.Convert(Factory.SQLExceptionConverter, exceptionContext); } } diff --git a/src/NHibernate/Async/Persister/Entity/ILoadable.cs b/src/NHibernate/Async/Persister/Entity/ILoadable.cs index 08729f3ad44..bab57223561 100644 --- a/src/NHibernate/Async/Persister/Entity/ILoadable.cs +++ b/src/NHibernate/Async/Persister/Entity/ILoadable.cs @@ -50,12 +50,12 @@ public static Task HydrateAsync( if (loadable is AbstractEntityPersister abstractEntityPersister) { return abstractEntityPersister.HydrateAsync( - rs, id, obj, suffixedPropertyColumns, fetchedLazyProperties, allProperties, session, cancellationToken); + rs, id, obj, suffixedPropertyColumns, fetchedLazyProperties, allProperties, session, cancellationToken); } var rootLoadable = loadable.RootEntityName == loadable.EntityName - ? loadable - : (ILoadable) loadable.Factory.GetEntityPersister(loadable.RootEntityName); + ? loadable + : (ILoadable) loadable.Factory.GetEntityPersister(loadable.RootEntityName); #pragma warning disable 618 // Fallback to the old behavior diff --git a/src/NHibernate/Async/Tool/hbm2ddl/SchemaMetadataUpdater.cs b/src/NHibernate/Async/Tool/hbm2ddl/SchemaMetadataUpdater.cs index 8d392ebb8a5..b17f66bac3d 100644 --- a/src/NHibernate/Async/Tool/hbm2ddl/SchemaMetadataUpdater.cs +++ b/src/NHibernate/Async/Tool/hbm2ddl/SchemaMetadataUpdater.cs @@ -41,8 +41,8 @@ public static Task UpdateAsync(Configuration configuration, Dialect.Dialect dial try { return UpdateDialectKeywordsAsync( - dialect, - new ManagedProviderConnectionHelper(configuration.GetDerivedProperties()), cancellationToken); + dialect, + new ManagedProviderConnectionHelper(configuration.GetDerivedProperties()), cancellationToken); } catch (Exception ex) { diff --git a/src/NHibernate/Async/Transaction/AdoNetTransactionFactory.cs b/src/NHibernate/Async/Transaction/AdoNetTransactionFactory.cs index 76466173109..d6d5c59925d 100644 --- a/src/NHibernate/Async/Transaction/AdoNetTransactionFactory.cs +++ b/src/NHibernate/Async/Transaction/AdoNetTransactionFactory.cs @@ -46,8 +46,8 @@ async Task InternalExecuteWorkInIsolationAsync() // We make an exception for SQLite and use the session's connection, // since SQLite only allows one connection to the database. connection = session.Factory.Dialect is SQLiteDialect - ? session.Connection - : await (session.Factory.ConnectionProvider.GetConnectionAsync(cancellationToken)).ConfigureAwait(false); + ? session.Connection + : await (session.Factory.ConnectionProvider.GetConnectionAsync(cancellationToken)).ConfigureAwait(false); if (transacted) { @@ -78,15 +78,15 @@ async Task InternalExecuteWorkInIsolationAsync() } switch (t) - { - case HibernateException _: + { + case HibernateException _: throw; - case DbException _: + case DbException _: throw ADOExceptionHelper.Convert(session.Factory.SQLExceptionConverter, t, - "error performing isolated work"); - default: + "error performing isolated work"); + default: throw new HibernateException("error performing isolated work", t); - } + } } } finally