Added overload of Matches method to SimpleQueryBuilder and QueryBuilder<TDocument> that takes a BsonRegularExpression argument.

Author: rstam

Driver/Builders/SimpleQueryBuilder.cs

@@ -261,6 +261,28 @@ public IMongoQuery LTE(string name, BsonValue value)
             return new QueryDocument(name, new BsonDocument("$lte", value));
         }
 
+        /// <summary>
+        /// Tests that the value of the named element matches a regular expression (see $regex).
+        /// </summary>
+        /// <param name="name">The name of the element to test.</param>
+        /// <param name="regex">The regex.</param>
+        /// <returns>
+        /// A query.
+        /// </returns>
+        public IMongoQuery Matches(string name, BsonRegularExpression regex)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException("name");
+            }
+            if (regex == null)
+            {
+                throw new ArgumentNullException("regex");
+            }
+
+            return new QueryDocument(name, regex);
+        }
+
         /// <summary>
         /// Tests that the value of the named element matches a regular expression (see $regex).
         /// </summary>

Driver/Builders/TypedQueryBuilder.cs

@@ -227,6 +227,20 @@ public IMongoQuery LTE<TMember>(Expression<Func<TDocument, TMember>> memberExpre
             return _queryBuilder.LTE(serializationInfo.ElementName, serializedValue);
         }
 
+        /// <summary>
+        /// Tests that the value of the named element matches a regular expression (see $regex).
+        /// </summary>
+        /// <param name="memberExpression">The member expression representing the element to test.</param>
+        /// <param name="regex">The regex.</param>
+        /// <returns>
+        /// A query.
+        /// </returns>
+        public IMongoQuery Matches(Expression<Func<TDocument, string>> memberExpression, BsonRegularExpression regex)
+        {
+            var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
+            return _queryBuilder.Matches(serializationInfo.ElementName, regex);
+        }
+
         /// <summary>
         /// Tests that the value of the named element matches a regular expression (see $regex).
         /// </summary>

DriverUnitTests/Builders/TypedQueryBuilderTests.cs

@@ -344,13 +344,37 @@ public void TestLessThanOrEqual_NotExpression()
         }
 
         [Test]
-        public void TestMatches()
+        public void TestMatchesBsonRegularExpression()
+        {
+            var query = Query.Build<A>(qb => qb.Matches(a => a.S, new BsonRegularExpression("abc", "i")));
+            var expected = "{ \"s\" : /abc/i }";
+            Assert.AreEqual(expected, query.ToJson());
+        }
+
+        [Test]
+        public void TestMatchesPattern()
         {
             var query = Query.Build<A>(qb => qb.Matches(a => a.S, "abc"));
             var expected = "{ \"s\" : /abc/ }";
             Assert.AreEqual(expected, query.ToJson());
         }
 
+        [Test]
+        public void TestMatchesPatternOptions()
+        {
+            var query = Query.Build<A>(qb => qb.Matches(a => a.S, "abc", "i"));
+            var expected = "{ \"s\" : /abc/i }";
+            Assert.AreEqual(expected, query.ToJson());
+        }
+
+        [Test]
+        public void TestMatchesRegex()
+        {
+            var query = Query.Build<A>(qb => qb.Matches(a => a.S, new Regex("abc", RegexOptions.IgnoreCase)));
+            var expected = "{ \"s\" : /abc/i }";
+            Assert.AreEqual(expected, query.ToJson());
+        }
+
         [Test]
         public void TestMatchesExpressionStringContains()
         {