Fix mapping in tests for Oracle

Iwanow, Mihail (EXT) · Iwanow, Mihail (EXT) · commit cfb9eb7d6c85 · 2018-11-16T08:56:07.000+01:00
diff --git a/src/NHibernate.Test/Async/NHSpecificTest/NH3848/Fixture.cs b/src/NHibernate.Test/Async/NHSpecificTest/NH3848/Fixture.cs
@@ -69,7 +69,7 @@ protected override HbmMapping GetMappings()
 			{
 				rc.Table("Orders");
 				rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
-				rc.Property(x => x.Number);
+				rc.Property(x => x.Number, m => m.Column("`Number`"));
 				rc.ManyToOne(x => x.Customer, m => m.Column("CustomerId"));
 				rc.Cache(c => c.Usage(CacheUsage.ReadWrite));
 			});
diff --git a/src/NHibernate.Test/NHSpecificTest/NH3848/Fixture.cs b/src/NHibernate.Test/NHSpecificTest/NH3848/Fixture.cs
@@ -57,7 +57,7 @@ protected override HbmMapping GetMappings()
 			{
 				rc.Table("Orders");
 				rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));
-				rc.Property(x => x.Number);
+				rc.Property(x => x.Number, m => m.Column("`Number`"));
 				rc.ManyToOne(x => x.Customer, m => m.Column("CustomerId"));
 				rc.Cache(c => c.Usage(CacheUsage.ReadWrite));
 			});
diff --git a/src/NHibernate/Async/Engine/Loading/CollectionLoadContext.cs b/src/NHibernate/Async/Engine/Loading/CollectionLoadContext.cs
@@ -215,7 +215,7 @@ private async Task EndLoadingCollectionAsync(
 		/// <param name="cacheBatchingHandler">The action for handling cache batching</param>
 		/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>
 		private async Task AddCollectionToCacheAsync(LoadingCollectionEntry lce, ICollectionPersister persister,
-										  Action<CachePutData> cacheBatchingHandler, CancellationToken cancellationToken)
+		                                  Action<CachePutData> cacheBatchingHandler, CancellationToken cancellationToken)
 		{
 			cancellationToken.ThrowIfCancellationRequested();
 			ISessionImplementor session = LoadContext.PersistenceContext.Session;
@@ -270,8 +270,8 @@ private async Task AddCollectionToCacheAsync(LoadingCollectionEntry lce, ICollec
 			else
 			{
 				bool put = await (persister.Cache.PutAsync(cacheKey, persister.CacheEntryStructure.Structure(entry),
-											   session.Timestamp, version, versionComparator,
-											   factory.Settings.IsMinimalPutsEnabled && session.CacheMode != CacheMode.Refresh, cancellationToken)).ConfigureAwait(false);
+				                               session.Timestamp, version, versionComparator,
+				                               factory.Settings.IsMinimalPutsEnabled && session.CacheMode != CacheMode.Refresh, cancellationToken)).ConfigureAwait(false);
 
 				if (put && factory.Statistics.IsStatisticsEnabled)
 				{

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ protected override HbmMapping GetMappings()`
`69`	`69`	`{`
`70`	`70`	`rc.Table("Orders");`
`71`	`71`	`rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));`
`72`		`- rc.Property(x => x.Number);`
	`72`	+ rc.Property(x => x.Number, m => m.Column("`Number`"));
`73`	`73`	`rc.ManyToOne(x => x.Customer, m => m.Column("CustomerId"));`
`74`	`74`	`rc.Cache(c => c.Usage(CacheUsage.ReadWrite));`
`75`	`75`	`});`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ protected override HbmMapping GetMappings()`
`57`	`57`	`{`
`58`	`58`	`rc.Table("Orders");`
`59`	`59`	`rc.Id(x => x.Id, m => m.Generator(Generators.GuidComb));`
`60`		`- rc.Property(x => x.Number);`
	`60`	+ rc.Property(x => x.Number, m => m.Column("`Number`"));
`61`	`61`	`rc.ManyToOne(x => x.Customer, m => m.Column("CustomerId"));`
`62`	`62`	`rc.Cache(c => c.Usage(CacheUsage.ReadWrite));`
`63`	`63`	`});`
Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,7 @@ private async Task EndLoadingCollectionAsync(`
`215`	`215`	`/// <param name="cacheBatchingHandler">The action for handling cache batching</param>`
`216`	`216`	`/// <param name="cancellationToken">A cancellation token that can be used to cancel the work</param>`
`217`	`217`	`private async Task AddCollectionToCacheAsync(LoadingCollectionEntry lce, ICollectionPersister persister,`
`218`		`- Action<CachePutData> cacheBatchingHandler, CancellationToken cancellationToken)`
	`218`	`+ Action<CachePutData> cacheBatchingHandler, CancellationToken cancellationToken)`
`219`	`219`	`{`
`220`	`220`	`cancellationToken.ThrowIfCancellationRequested();`
`221`	`221`	`ISessionImplementor session = LoadContext.PersistenceContext.Session;`
`@@ -270,8 +270,8 @@ private async Task AddCollectionToCacheAsync(LoadingCollectionEntry lce, ICollec`
`270`	`270`	`else`
`271`	`271`	`{`
`272`	`272`	`bool put = await (persister.Cache.PutAsync(cacheKey, persister.CacheEntryStructure.Structure(entry),`
`273`		`- session.Timestamp, version, versionComparator,`
`274`		`- factory.Settings.IsMinimalPutsEnabled && session.CacheMode != CacheMode.Refresh, cancellationToken)).ConfigureAwait(false);`
	`273`	`+ session.Timestamp, version, versionComparator,`
	`274`	`+ factory.Settings.IsMinimalPutsEnabled && session.CacheMode != CacheMode.Refresh, cancellationToken)).ConfigureAwait(false);`
`275`	`275`
`276`	`276`	`if (put && factory.Statistics.IsStatisticsEnabled)`
`277`	`277`	`{`