CSHARP-1410: Allow $type to support string representations of type (in 1.x).

Author: rstam

MongoDB.Driver/Builders/QueryBuilder.cs

@@ -684,6 +684,27 @@ public static IMongoQuery Type(string name, BsonType type)
             return new QueryDocument(name, condition);
         }
 
+        /// <summary>
+        /// Tests that the type of the named element is equal to some type (see $type).
+        /// </summary>
+        /// <param name="name">The name of the element to test.</param>
+        /// <param name="type">The type to compare to.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public static IMongoQuery Type(string name, string type)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException("name");
+            }
+            if (type == null)
+            {
+                throw new ArgumentNullException("type");
+            }
+
+            var condition = new BsonDocument("$type", type);
+            return new QueryDocument(name, condition);
+        }
+
         /// <summary>
         /// Tests that a JavaScript expression is true (see $where).
         /// </summary>
@@ -1448,6 +1469,18 @@ public static IMongoQuery Type<TMember>(Expression<Func<TDocument, TMember>> mem
             return new QueryBuilder<TDocument>().Type(memberExpression, type);
         }
 
+        /// <summary>
+        /// Tests that the type of the named element is equal to some type (see $type).
+        /// </summary>
+        /// <typeparam name="TMember">The member type.</typeparam>
+        /// <param name="memberExpression">The member expression representing the element to test.</param>
+        /// <param name="type">The type to compare to.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public static IMongoQuery Type<TMember>(Expression<Func<TDocument, TMember>> memberExpression, string type)
+        {
+            return new QueryBuilder<TDocument>().Type(memberExpression, type);
+        }
+
         /// <summary>
         /// Tests that any of the values in the named array element is equal to some type (see $type).
         /// </summary>
@@ -1460,6 +1493,18 @@ public static IMongoQuery Type<TValue>(Expression<Func<TDocument, IEnumerable<TV
             return new QueryBuilder<TDocument>().Type(memberExpression, type);
         }
 
+        /// <summary>
+        /// Tests that any of the values in the named array element is equal to some type (see $type).
+        /// </summary>
+        /// <typeparam name="TValue">The type of the value.</typeparam>
+        /// <param name="memberExpression">The member expression representing the element to test.</param>
+        /// <param name="type">The type to compare to.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public static IMongoQuery Type<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>> memberExpression, string type)
+        {
+            return new QueryBuilder<TDocument>().Type(memberExpression, type);
+        }
+
         /// <summary>
         /// Builds a query from an expression.
         /// </summary>
@@ -2301,6 +2346,24 @@ public IMongoQuery Type<TMember>(Expression<Func<TDocument, TMember>> memberExpr
             return Query.Type(serializationInfo.ElementName, type);
         }
 
+        /// <summary>
+        /// Tests that the type of the named element is equal to some type (see $type).
+        /// </summary>
+        /// <typeparam name="TMember">The member type.</typeparam>
+        /// <param name="memberExpression">The member expression representing the element to test.</param>
+        /// <param name="type">The type to compare to.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public IMongoQuery Type<TMember>(Expression<Func<TDocument, TMember>> memberExpression, string type)
+        {
+            if (memberExpression == null)
+            {
+                throw new ArgumentNullException("memberExpression");
+            }
+
+            var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
+            return Query.Type(serializationInfo.ElementName, type);
+        }
+
         /// <summary>
         /// Tests that any of the values in the named array element is equal to some type (see $type).
         /// </summary>
@@ -2319,6 +2382,24 @@ public IMongoQuery Type<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>>
             return Query.Type(serializationInfo.ElementName, type);
         }
 
+        /// <summary>
+        /// Tests that any of the values in the named array element is equal to some type (see $type).
+        /// </summary>
+        /// <typeparam name="TValue">The type of the value.</typeparam>
+        /// <param name="memberExpression">The member expression representing the element to test.</param>
+        /// <param name="type">The type to compare to.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public IMongoQuery Type<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>> memberExpression, string type)
+        {
+            if (memberExpression == null)
+            {
+                throw new ArgumentNullException("memberExpression");
+            }
+
+            var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
+            return Query.Type(serializationInfo.ElementName, type);
+        }
+
         /// <summary>
         /// Builds a query from an expression.
         /// </summary>

MongoDB.DriverUnitTests/Builders/QueryBuilderTests.cs

@@ -938,6 +938,15 @@ public void TestType()
             Assert.AreEqual(NegativeTest("a", selector), Query.Not(query).ToJson());
         }
 
+        [Test]
+        public void TestType_number()
+        {
+            var query = Query.Type("a", "number");
+            var selector = "{ \"$type\" : \"number\" }";
+            Assert.AreEqual(PositiveTest("a", selector), query.ToJson());
+            Assert.AreEqual(NegativeTest("a", selector), Query.Not(query).ToJson());
+        }
+
         [Test]
         public void TestWhere()
         {

MongoDB.DriverUnitTests/Builders/QueryBuilderTypedTests.cs

@@ -928,6 +928,14 @@ public void TestType()
             Assert.AreEqual(expected, query.ToJson());
         }
 
+        [Test]
+        public void TestType_number()
+        {
+            var query = Query<A>.Type(a => a.S, "number");
+            var expected = "{ \"s\" : { \"$type\" : \"number\" } }";
+            Assert.AreEqual(expected, query.ToJson());
+        }
+
         [Test]
         public void TestType_Not()
         {
@@ -936,6 +944,14 @@ public void TestType_Not()
             Assert.AreEqual(expected, query.ToJson());
         }
 
+        [Test]
+        public void TestType_Not_number()
+        {
+            var query = Query.Not(Query<A>.Type(a => a.S, "number"));
+            var expected = "{ \"s\" : { \"$not\" : { \"$type\" : \"number\" } } }";
+            Assert.AreEqual(expected, query.ToJson());
+        }
+
         [Test]
         public void TestType_Array()
         {
@@ -944,6 +960,14 @@ public void TestType_Array()
             Assert.AreEqual(expected, query.ToJson());
         }
 
+        [Test]
+        public void TestType_Array_number()
+        {
+            var query = Query<A>.Type(a => a.J, "number");
+            var expected = "{ \"j\" : { \"$type\" : \"number\" } }";
+            Assert.AreEqual(expected, query.ToJson());
+        }
+
         [Test]
         public void TestWhere()
         {