Fix exception when mapping nested generic classes

W1N9Zr0 · W1N9Zr0 · commit cb53d04a170d · 2012-11-05T16:09:03.000-05:00
If the generic is declared in the outer class and the inner class is
mapped, there is no ` in the name of the inner class.
diff --git a/src/FluentNHibernate/Mapping/ClassMap.cs b/src/FluentNHibernate/Mapping/ClassMap.cs
@@ -691,7 +691,11 @@ string GetDefaultTableName()
             if (EntityType.IsGenericType)
             {
                 // special case for generics: GenericType_GenericParameterType
-                tableName = EntityType.Name.Substring(0, EntityType.Name.IndexOf('`'));
+                var genericQuoteIndex = EntityType.Name.IndexOf('`');
+                if (genericQuoteIndex >= 0)
+                {
+                    tableName = EntityType.Name.Substring(0, genericQuoteIndex);
+                } // else generic declaration not directly in this class
 
                 foreach (var argument in EntityType.GetGenericArguments())
                 {

Original file line number	Diff line number	Diff line change
`@@ -691,7 +691,11 @@ string GetDefaultTableName()`
`691`	`691`	`if (EntityType.IsGenericType)`
`692`	`692`	`{`
`693`	`693`	`// special case for generics: GenericType_GenericParameterType`
`694`		- tableName = EntityType.Name.Substring(0, EntityType.Name.IndexOf('`'));
	`694`	+ var genericQuoteIndex = EntityType.Name.IndexOf('`');
	`695`	`+ if (genericQuoteIndex >= 0)`
	`696`	`+ {`
	`697`	`+ tableName = EntityType.Name.Substring(0, genericQuoteIndex);`
	`698`	`+ } // else generic declaration not directly in this class`
`695`	`699`
`696`	`700`	`foreach (var argument in EntityType.GetGenericArguments())`
`697`	`701`	`{`