Merge branch 'pr/368'

Dapper.Contrib/SqlMapperExtensions.cs

@@ -479,7 +479,7 @@ private static ISqlAdapter GetFormatter(IDbConnection connection)
 
         static class ProxyGenerator
         {
-            private static readonly Dictionary<Type, object> TypeCache = new Dictionary<Type, object>();
+            private static readonly Dictionary<Type, Type> TypeCache = new Dictionary<Type, Type>();
 
             private static AssemblyBuilder GetAsmBuilder(string name)
             {
@@ -494,10 +494,10 @@ public static T GetInterfaceProxy<T>()
             {
                 Type typeOfT = typeof(T);
 
-                object k;
+                Type k;
                 if (TypeCache.TryGetValue(typeOfT, out k))
                 {
-                    return (T)k;
+                    return (T)Activator.CreateInstance(k);
                 }
                 var assemblyBuilder = GetAsmBuilder(typeOfT.Name);
 
@@ -525,12 +525,8 @@ public static T GetInterfaceProxy<T>()
                 var generatedType = typeBuilder.CreateType();
 #endif
 
-                //assemblyBuilder.Save(name + ".dll");  //NOTE: to save, uncomment
-
-                var generatedObject = Activator.CreateInstance(generatedType);
-
-                TypeCache.Add(typeOfT, generatedObject);
-                return (T)generatedObject;
+                TypeCache.Add(typeOfT, generatedType);
+                return (T)Activator.CreateInstance(generatedType);
             }
 
 

Dapper.Tests.Contrib/TestSuite.cs

@@ -411,6 +411,8 @@ public void GetAll()
                 users.Count.IsEqualTo(numberOfEntities);
                 var iusers = connection.GetAll<IUser>().ToList();
                 iusers.Count.IsEqualTo(numberOfEntities);
+                for (var i = 0; i < numberOfEntities; i++)
+                    iusers[i].Age.IsEqualTo(i);
             }
 
         }