Merge branch 'typedcollections' into clientjoin

Conflicts: source/MongoDB.Tests/IntegrationTests/Linq/MongoQueryTests.cs
itsu · May 1, 2010 · 534c740 · 534c740
2 parents 0d4e26d + 0e2dfe6
commit 534c740
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/source/MongoDB.Tests/IntegrationTests/Linq/MongoQueryTests.cs b/source/MongoDB.Tests/IntegrationTests/Linq/MongoQueryTests.cs
@@ -362,4 +362,4 @@ public void Join()
             Assert.AreEqual(0, people.Count);
         }
     }
-}
+}
diff --git a/source/MongoDB.Tests/IntegrationTests/TestCollection_1.cs b/source/MongoDB.Tests/IntegrationTests/TestCollection_1.cs
@@ -276,7 +276,7 @@ private class DeletesEntity
             };
             inserts.Insert(album);
 
-            var result = inserts.FindOne(new Document().Add("songs.title", "Deliveries After Dark"));
+            var result = inserts.FindOne(new Document().Add("Songs.Title", "Deliveries After Dark"));
             Assert.IsNotNull(result);
 
             Assert.AreEqual(album.Songs.Count, result.Songs.Count);

diff --git a/source/MongoDB/Serialization/Descriptors/ClassMapPropertyDescriptorBase.cs b/source/MongoDB/Serialization/Descriptors/ClassMapPropertyDescriptorBase.cs
@@ -81,14 +81,20 @@ protected PersistentMemberMap GetMemberMapFromMemberName(string name)
 
             var parts = name.Split('.');
             memberMap = ClassMap.GetMemberMapFromMemberName(parts[0]);
+            if (memberMap == null)
+                return null;
+
             var currentType = memberMap.MemberReturnType;
             for (int i = 1; i < parts.Length && memberMap != null; i++)
             {
-                if (IsNumeric(parts[i])) //we are an array indexer
+                var collectionMemberMap = memberMap as CollectionMemberMap;
+                if (collectionMemberMap != null)
                 {
                     currentType = ((CollectionMemberMap)memberMap).ElementType;
-                    continue;
+                    if (IsNumeric(parts[i])) //we are an array indexer
+                        continue;
                 }
+
                 var classMap = _mappingStore.GetClassMap(currentType);
                 memberMap = classMap.GetMemberMapFromAlias(parts[i]);
                 if (memberMap != null)
@@ -136,11 +142,15 @@ protected string GetAliasFromMemberName(string name)
             {
                 if(memberMap != null)
                 {
-                    if (IsNumeric(parts[i])) //we are an array indexer
+                    var collectionMemberMap = memberMap as CollectionMemberMap;
+                    if (collectionMemberMap != null)
                     {
                         currentType = ((CollectionMemberMap)memberMap).ElementType;
-                        sb.Append(".").Append(parts[i]);
-                        continue;
+                        if (IsNumeric(parts[i])) //we are an array indexer
+                        {
+                            sb.Append(".").Append(parts[i]);
+                            continue;
+                        }
                     }
 
                     var classMap = _mappingStore.GetClassMap(currentType);