NH-2861 - Fix failing tests

hazzik · hazzik · commit 34db35a61e3a · 2014-05-07T19:41:18.000+12:00
diff --git a/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs b/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs
@@ -3211,9 +3211,9 @@ private IDictionary<string, string> GetColumnsToTableAliasMap(string rootAlias)
 			for (int i =0; i < SubclassPropertyNameClosure.Length; i++)
 			{
 				string property = SubclassPropertyNameClosure[i];
-				string[] cols = subclassPropertyColumnNames[property];
+                string[] cols = GetSubclassPropertyColumnNames(property);
 
-				if (cols.Length > 0)
+				if (cols != null && cols.Length > 0)
 				{
 					PropertyKey key = new PropertyKey(cols[0], GetSubclassPropertyTableNumber(i));
 					propDictionary[key] = property;

Original file line number	Diff line number	Diff line change
`@@ -3211,9 +3211,9 @@ private IDictionary<string, string> GetColumnsToTableAliasMap(string rootAlias)`
`3211`	`3211`	`for (int i =0; i < SubclassPropertyNameClosure.Length; i++)`
`3212`	`3212`	`{`
`3213`	`3213`	`string property = SubclassPropertyNameClosure[i];`
`3214`		`- string[] cols = subclassPropertyColumnNames[property];`
	`3214`	`+ string[] cols = GetSubclassPropertyColumnNames(property);`
`3215`	`3215`
`3216`		`- if (cols.Length > 0)`
	`3216`	`+ if (cols != null && cols.Length > 0)`
`3217`	`3217`	`{`
`3218`	`3218`	`PropertyKey key = new PropertyKey(cols[0], GetSubclassPropertyTableNumber(i));`
`3219`	`3219`	`propDictionary[key] = property;`