Merge pull request #188 from W1N9Zr0/master

Fix exception when mapping nested generic classes

Author: chester89

src/FluentNHibernate.Testing/DomainModel/Mapping/PropertyPartTester.cs

@@ -441,6 +441,18 @@ public void CanSpecifyNotUpdate()
                 .Element("class/property").HasAttribute("update", "false");
         }
 
+        [Test]
+        public void MapNestedGeneric()
+        {
+            new MappingTester<OuterTarget<String>.NestedTarget>()
+                .ForMapping(m =>
+                {
+                    m.Id(x => x.Id);
+                    m.Map(x => x.Value);
+                })
+                .Element("class").HasAttribute("table", "`NestedTarget_String`");
+        }
+
         #region Custom IUserType impl for testing
         public class CustomTypeForTesting : IUserType
         {
@@ -609,6 +621,15 @@ public class ComponentTarget
         public object Name { get; set; }
     }
 
+    class OuterTarget<T>
+    {
+        public class NestedTarget
+        {
+            public virtual int Id { get; set; }
+            public virtual T Value { get; set; }
+        }
+    }
+
     public class FakePropertyAccessor : IPropertyAccessor
     {
         public IGetter GetGetter(Type theClass, string propertyName)

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())
                 {