fix broken tests

Jeff Hagen · Jeff Hagen · commit 47840969ed68 · 2024-11-27T10:13:04.000-05:00
diff --git a/src/NHibernate.Test/Async/QueryTranslator/CustomQueryLoaderFixture.cs b/src/NHibernate.Test/Async/QueryTranslator/CustomQueryLoaderFixture.cs
@@ -42,7 +42,8 @@ internal sealed class CustomQueryLoaderFixtureAsync : TestCase
 				"Northwind.Mappings.TimeSheet.hbm.xml",
 				"Northwind.Mappings.Animal.hbm.xml",
 				"Northwind.Mappings.Patient.hbm.xml",
-				"Northwind.Mappings.NumericEntity.hbm.xml"
+				"Northwind.Mappings.NumericEntity.hbm.xml",
+				"Northwind.Mappings.CompositeIdEntity.hbm.xml"
 			};
 
 		protected override string MappingsAssembly => "NHibernate.DomainModel";
diff --git a/src/NHibernate.Test/Criteria/ReadonlyTests/CriteriaNorthwindReadonlyTestCase.cs b/src/NHibernate.Test/Criteria/ReadonlyTests/CriteriaNorthwindReadonlyTestCase.cs
@@ -32,7 +32,8 @@ protected override string[] Mappings
 					"Northwind.Mappings.User.hbm.xml",
 					"Northwind.Mappings.TimeSheet.hbm.xml",
 					"Northwind.Mappings.Animal.hbm.xml",
-					"Northwind.Mappings.Patient.hbm.xml"
+					"Northwind.Mappings.Patient.hbm.xml",
+					"Northwind.Mappings.CompositeIdEntity.hbm.xml"
 				};
 			}
 		}
diff --git a/src/NHibernate.Test/DbScripts/MsSql2008DialectLinqReadonlyCreateScript.sql b/src/NHibernate.Test/DbScripts/MsSql2008DialectLinqReadonlyCreateScript.sql
diff --git a/src/NHibernate.Test/DbScripts/MsSql2012DialectLinqReadonlyCreateScript.sql b/src/NHibernate.Test/DbScripts/MsSql2012DialectLinqReadonlyCreateScript.sql
@@ -161,9 +161,8 @@ SET IDENTITY_INSERT [dbo].[AnotherEntity] ON
 INSERT [dbo].[AnotherEntity] ([Id], [Output]) VALUES (1, N'output')
 INSERT [dbo].[AnotherEntity] ([Id], [Input]) VALUES (2, N'input')
 INSERT [dbo].[AnotherEntity] ([Id], [Input], [Output]) VALUES (3, N'i/o', N'i/o')
-INSERT [dbo].[AnotherEntity] ([Id], [Input], [Output]) VALUES (4, N'input', N'output')
+INSERT [dbo].[AnotherEntity] ([Id], [Input], [Output], [CompositeObjectId], [CompositeTenantId]) VALUES (4, N'input', N'output', 1, 10)
 INSERT [dbo].[AnotherEntity] ([Id], [Input], [Output]) VALUES (5, NULL, NULL)
-INSERT [dbo].[AnotherEntity] ([Id], [Input], [Output], [CompositeObjectId], [CompositeTenantId]) VALUES (6, N'in', N'out', 1, 10)
 SET IDENTITY_INSERT [dbo].[AnotherEntity] OFF
 /****** Object:  Table [dbo].[CompositeIdEntity] ******/
 SET ANSI_NULLS ON
diff --git a/src/NHibernate.Test/DbScripts/PostgreSQL83DialectLinqReadonlyCreateScript.sql b/src/NHibernate.Test/DbScripts/PostgreSQL83DialectLinqReadonlyCreateScript.sql
diff --git a/src/NHibernate.Test/Linq/LinqReadonlyTestsContext.cs b/src/NHibernate.Test/Linq/LinqReadonlyTestsContext.cs
@@ -44,7 +44,8 @@ private IEnumerable<string> Mappings
 					"Northwind.Mappings.TimeSheet.hbm.xml",
 					"Northwind.Mappings.Animal.hbm.xml",
 					"Northwind.Mappings.Patient.hbm.xml",
-					"Northwind.Mappings.NumericEntity.hbm.xml"
+					"Northwind.Mappings.NumericEntity.hbm.xml",
+					"Northwind.Mappings.CompositeIdEntity.hbm.xml"
 				};
 			}
 		}
diff --git a/src/NHibernate.Test/QueryTranslator/CustomQueryLoaderFixture.cs b/src/NHibernate.Test/QueryTranslator/CustomQueryLoaderFixture.cs
@@ -30,7 +30,8 @@ internal sealed class CustomQueryLoaderFixture : TestCase
 				"Northwind.Mappings.TimeSheet.hbm.xml",
 				"Northwind.Mappings.Animal.hbm.xml",
 				"Northwind.Mappings.Patient.hbm.xml",
-				"Northwind.Mappings.NumericEntity.hbm.xml"
+				"Northwind.Mappings.NumericEntity.hbm.xml",
+				"Northwind.Mappings.CompositeIdEntity.hbm.xml"
 			};
 
 		protected override string MappingsAssembly => "NHibernate.DomainModel";
diff --git a/src/NHibernate/Linq/ReWriters/AddJoinsReWriter.cs b/src/NHibernate/Linq/ReWriters/AddJoinsReWriter.cs
@@ -97,14 +97,18 @@ bool IIsEntityDecider.IsEntity(MemberExpression expression, out bool isIdentifie
 			if (ExpressionsHelper.TryGetMappedType(_sessionFactory, expression, out var mappedType, out var entityPersister, out var componentType, out var memberPath))
 			{
 				isIdentifier = IsIdentifierPath(entityPersister, componentType, memberPath);
-				return mappedType.IsEntityType;
+				return mappedType?.IsEntityType == true;
 			}
 			isIdentifier = false;
 			return false;
 		}
 
 		bool IsIdentifierPath(IEntityPersister entityPersister, IAbstractComponentType componentType, string memberPath)
 		{
+			if (entityPersister == null)
+			{
+				return false;
+			}
 			if (entityPersister.IdentifierPropertyName == memberPath)
 			{
 				return true;

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ protected override string[] Mappings`
`32`	`32`	`"Northwind.Mappings.User.hbm.xml",`
`33`	`33`	`"Northwind.Mappings.TimeSheet.hbm.xml",`
`34`	`34`	`"Northwind.Mappings.Animal.hbm.xml",`
`35`		`- "Northwind.Mappings.Patient.hbm.xml"`
	`35`	`+ "Northwind.Mappings.Patient.hbm.xml",`
	`36`	`+ "Northwind.Mappings.CompositeIdEntity.hbm.xml"`
`36`	`37`	`};`
`37`	`38`	`}`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@ private IEnumerable<string> Mappings`
`44`	`44`	`"Northwind.Mappings.TimeSheet.hbm.xml",`
`45`	`45`	`"Northwind.Mappings.Animal.hbm.xml",`
`46`	`46`	`"Northwind.Mappings.Patient.hbm.xml",`
`47`		`- "Northwind.Mappings.NumericEntity.hbm.xml"`
	`47`	`+ "Northwind.Mappings.NumericEntity.hbm.xml",`
	`48`	`+ "Northwind.Mappings.CompositeIdEntity.hbm.xml"`
`48`	`49`	`};`
`49`	`50`	`}`
`50`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,14 +97,18 @@ bool IIsEntityDecider.IsEntity(MemberExpression expression, out bool isIdentifie`
`97`	`97`	`if (ExpressionsHelper.TryGetMappedType(_sessionFactory, expression, out var mappedType, out var entityPersister, out var componentType, out var memberPath))`
`98`	`98`	`{`
`99`	`99`	`isIdentifier = IsIdentifierPath(entityPersister, componentType, memberPath);`
`100`		`- return mappedType.IsEntityType;`
	`100`	`+ return mappedType?.IsEntityType == true;`
`101`	`101`	`}`
`102`	`102`	`isIdentifier = false;`
`103`	`103`	`return false;`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`bool IsIdentifierPath(IEntityPersister entityPersister, IAbstractComponentType componentType, string memberPath)`
`107`	`107`	`{`
	`108`	`+ if (entityPersister == null)`
	`109`	`+ {`
	`110`	`+ return false;`
	`111`	`+ }`
`108`	`112`	`if (entityPersister.IdentifierPropertyName == memberPath)`
`109`	`113`	`{`
`110`	`114`	`return true;`