Merge remote branch 'craig/master'

qjnz · Aug 2, 2010 · f604a53 · f604a53
2 parents 6fd8ac4 + 8f7cde7
commit f604a53
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 8 deletions.
diff --git a/examples/Simple/Main.cs b/examples/Simple/Main.cs
@@ -1,6 +1,9 @@
 using System;
 using System.Configuration;
+using System.Linq;
 using MongoDB;
+using MongoDB.Configuration;
+using MongoDB.Linq;
 
 namespace Simple
 {
@@ -18,11 +21,93 @@ internal class MainClass
         private Mongo mongo;
         private IMongoDatabase simple;
 
+        private class MyClass
+        {
+            public string Name { get; set; }
+            public  int Corners { get; set; }
+        }
+
+        private class SubClass : MyClass
+        {
+            public double Ratio { get; set; }
+        }
+
         public static void Main(string[] args)
         {
-            var main = new MainClass();
-            main.Setup();
-            main.Run();
+            var config = new MongoConfigurationBuilder();
+
+            // COMMENT OUT FROM HERE
+            config.Mapping(mapping =>
+            {
+                mapping.DefaultProfile(profile =>
+                {
+                    profile.SubClassesAre(t => t.IsSubclassOf(typeof(MyClass)));
+                });
+                mapping.Map<MyClass>();
+                mapping.Map<SubClass>();
+            });
+            // TO HERE
+
+            config.ConnectionString("Server=127.0.0.1");
+
+            using (Mongo mongo = new Mongo(config.BuildConfiguration()))
+            {
+                mongo.Connect();
+                try
+                {
+                    var db = mongo.GetDatabase("TestDb");
+                    var collection = db.GetCollection<MyClass>();
+
+                    MyClass square = new MyClass()
+                    {
+                        Corners = 4,
+                        Name = "Square"
+                    };
+
+                    MyClass circle = new MyClass()
+                    {
+                        Corners = 0,
+                        Name = "Circle"
+                    };
+
+                    SubClass sub = new SubClass()
+                    {
+                        Name = "SubClass",
+                        Corners = 6,
+                        Ratio = 3.43
+                    };
+
+                    collection.Save(square);
+                    collection.Save(circle);
+                    collection.Save(sub);
+
+                    var superclass = (from item in db.GetCollection<MyClass>("MyClass").Linq()
+                                where item.Corners > 1
+                                select item.Corners).ToList();
+
+                    var subclass = (from item in db.GetCollection<SubClass>("MyClass").Linq()
+                                    where item.Ratio > 1
+                                    select item.Corners).ToList();
+
+                    Console.WriteLine("Count by LINQ on typed collection: {0}", collection.Linq().Count(x => x.Corners > 1));
+                    Console.WriteLine("Count by LINQ on typed collection2: {0}", db.GetCollection<SubClass>().Linq().Count(x => x.Corners > 1));
+                    //Console.WriteLine("Count by LINQ on typed collection3: {0}", db.GetCollection<SubClass>().Count(new { Corners = Op.GreaterThan(1) }));
+                    Console.WriteLine("Count on typed collection: {0}", collection.Count(new { Corners = Op.GreaterThan(1) }));
+
+                    var coll = db.GetCollection("MyClass");
+                    var count = coll.Count(new Document("Corners", Op.GreaterThan(1)));
+                    Console.WriteLine("Count: {0}", count);
+                    Console.ReadKey();
+                }
+                finally
+                {
+                    mongo.Disconnect();
+                }
+            }
+
+            //var main = new MainClass();
+            //main.Setup();
+            //main.Run();
         }
 
         /// <summary>

diff --git a/source/MongoDB/Configuration/Mapping/Auto/AutoMapper.cs b/source/MongoDB/Configuration/Mapping/Auto/AutoMapper.cs
@@ -81,8 +81,8 @@ private ClassMap CreateClassMap(Type classType){
                 CollectionName = _profile.GetCollectionName(classType),
                 DiscriminatorAlias = _profile.GetDiscriminatorAlias(classType)
             };
-            if(!classType.IsInterface && !classType.IsAbstract)
-                classMap.Discriminator = _profile.GetDiscriminator(classType);
+            //if(!classType.IsInterface && !classType.IsAbstract)
+            //    classMap.Discriminator = _profile.GetDiscriminator(classType);
 
             classMap.IdMap = CreateIdMap(classType);
             classMap.ExtendedPropertiesMap = CreateExtendedPropertiesMap(classType);

diff --git a/source/MongoDB/Serialization/Builders/PolymorphicClassMapBuilder.cs b/source/MongoDB/Serialization/Builders/PolymorphicClassMapBuilder.cs
@@ -38,7 +38,10 @@ public void AddProperty(string name, object value)
         public object BuildObject()
         {
             if (_concreteEntityBuilder == null)
-                throw new Exception("Discriminator did not show up.");
+            {
+                //we'll assume that this is the root class in the hierarchy.
+                _concreteEntityBuilder = new ConcreteClassMapBuilder(_classMap);
+            }
 
             return _concreteEntityBuilder.BuildObject();
         }

diff --git a/source/MongoDB/Serialization/Descriptors/DocumentClassMapPropertyDescriptor.cs b/source/MongoDB/Serialization/Descriptors/DocumentClassMapPropertyDescriptor.cs
@@ -31,8 +31,22 @@ public DocumentClassMapPropertyDescriptor(IMappingStore mappingStore, IClassMap
         /// <returns></returns>
         public override IEnumerable<BsonProperty> GetProperties()
         {
-            if (ShouldPersistDiscriminator())
-                yield return CreateProperty(ClassMap.DiscriminatorAlias, ClassMap.Discriminator.GetType(), ClassMap.Discriminator, false);
+            if(ShouldPersistDiscriminator())
+            {
+                if (_document.ContainsKey("count")) //this is a special case
+                {
+                    var queryDoc = _document["query"] as Document;
+                    if (queryDoc == null)
+                    {
+                        //TODO: implement someway of shoving this value into the doc...
+                        throw new NotSupportedException("Count queries on subclasses using anonymous types is not supported.");
+                    }
+                    else if (!queryDoc.ContainsKey(ClassMap.DiscriminatorAlias))
+                        queryDoc.Append(ClassMap.DiscriminatorAlias, ClassMap.Discriminator);
+                }
+                else
+                    yield return CreateProperty(ClassMap.DiscriminatorAlias, ClassMap.Discriminator.GetType(), ClassMap.Discriminator, false);
+            }
 
             foreach (string key in _document.Keys)
             {