made DeprecatedQuery Obsolete. removed and, not, nor, and or operators from the static Query<T> class as they are merely more verbose versions of the same in the Query class. removed overloads for Matches in the Query class.

Author: craiggwilson

Driver/Builders/DeprecatedQueryBuilder.cs

@@ -28,6 +28,7 @@ namespace MongoDB.Driver.Builders
  /// <summary>
  /// A builder for creating queries.
  /// </summary>
+ [Obsolete("There are 2 new classes used for building queries. MongoDB.Driver.Builders.Query and MongoDB.Driver.Builders.Query<T>")]
  public static class DeprecatedQuery
  {
  // public static properties
@@ -772,6 +773,7 @@ private static void PromoteQueryToDollarAndForm(BsonDocument query, BsonElement
  /// A builder for creating queries.
  /// </summary>
  [Serializable]
+ [Obsolete("This class has been replaced by MongoDB.Driver.Builders.Query")]
  public abstract class DeprecatedQueryBuilder : BuilderBase
  {
  // private fields
@@ -826,6 +828,7 @@ protected override void Serialize(BsonWriter bsonWriter, Type nominalType, IBson
  /// A builder for creating queries.
  /// </summary>
  [Serializable]
+ [Obsolete("This class has been replaced by MongoDB.Driver.Builders.Query")]
  public class QueryComplete : DeprecatedQueryBuilder, IMongoQuery
  {
  // constructors
@@ -843,6 +846,7 @@ public QueryComplete(BsonDocument document)
  /// A builder for creating queries.
  /// </summary>
  [Serializable]
+ [Obsolete("This class has been replaced by MongoDB.Driver.Builders.Query")]
  public class QueryConditionList : QueryComplete
  {
  // private fields
@@ -1247,6 +1251,7 @@ public QueryConditionList WithinRectangle(
  /// <summary>
  /// A builder for creating queries.
  /// </summary>
+ [Obsolete("This class has been replaced by MongoDB.Driver.Builders.Query")]
  public class QueryNot
  {
  // private fields
@@ -1537,6 +1542,7 @@ public QueryNotConditionList Type(BsonType type)
  /// A builder for creating queries.
  /// </summary>
  [Serializable]
+ [Obsolete("This class has been replaced by MongoDB.Driver.Builders.Query")]
  public class QueryNotConditionList : QueryComplete
  {
  // private fields

Driver/Builders/QueryBuilder.cs

@@ -23,6 +23,9 @@
 
 namespace MongoDB.Driver.Builders
 {
+ /// <summary>
+ /// A builder for creating queries.
+ /// </summary>
  public static class Query
  {
  // public static properties
@@ -274,71 +277,6 @@ public static IMongoQuery Matches(string name, BsonRegularExpression regex)
  return new QueryDocument(name, regex);
  }
 
- /// <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="pattern">The pattern.</param>
- /// <returns>An IMongoQuery.</returns>
- public static IMongoQuery Matches(string name, string pattern)
- {
- if (name == null)
- {
- throw new ArgumentNullException("name");
- }
- if (pattern == null)
- {
- throw new ArgumentNullException("pattern");
- }
-
- return new QueryDocument(name, new BsonRegularExpression(pattern));
- }
-
- /// <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="pattern">The pattern.</param>
- /// <param name="options">The options.</param>
- /// <returns>An IMongoQuery.</returns>
- public static IMongoQuery Matches(string name, string pattern, string options)
- {
- if (name == null)
- {
- throw new ArgumentNullException("name");
- }
- if (pattern == null)
- {
- throw new ArgumentNullException("pattern");
- }
- if (options == null)
- {
- throw new ArgumentNullException("options");
- }
-
- return new QueryDocument(name, new BsonRegularExpression(pattern, options));
- }
-
- /// <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>An IMongoQuery.</returns>
- public static IMongoQuery Matches(string name, Regex regex)
- {
- if (name == null)
- {
- throw new ArgumentNullException("name");
- }
- if (regex == null)
- {
- throw new ArgumentNullException("regex");
- }
-
- return new QueryDocument(name, new BsonRegularExpression(regex));
- }
-
  /// <summary>
  /// Tests that the modulus of the value of the named element matches some value (see $mod).
  /// </summary>
@@ -560,7 +498,7 @@ public static IMongoQuery Or(IEnumerable<IMongoQuery> queries)
  switch (queryArray.Count)
  {
  case 0:
- return new QueryComplete(new QueryDocument()); // all queries were empty queries so just return an empty query
+ return new QueryDocument(); // all queries were empty so just return an empty query
  case 1:
  return new QueryDocument(queryArray[0].AsBsonDocument);
  default:

Driver/Builders/QueryBuilderTyped.cs

@@ -46,26 +46,6 @@ public static IMongoQuery All<TValue>(Expression<Func<TDocument, IEnumerable<TVa
  return new QueryBuilder<TDocument>().All(memberExpression, values);
  }
 
- /// <summary>
- /// Tests that all the queries are true (see $and in newer versions of the server).
- /// </summary>
- /// <param name="queries">A list of subqueries.</param>
- /// <returns>An IMongoQuery.</returns>
- public static IMongoQuery And(IEnumerable<IMongoQuery> queries)
- {
- return new QueryBuilder<TDocument>().And(queries);
- }
-
- /// <summary>
- /// Tests that all the queries are true (see $and in newer versions of the server).
- /// </summary>
- /// <param name="queries">A list of subqueries.</param>
- /// <returns>An IMongoQuery.</returns>
- public static IMongoQuery And(params IMongoQuery[] queries)
- {
- return new QueryBuilder<TDocument>().And(queries);
- }
-
  /// <summary>
  /// Tests that at least one item of the named array element matches a query (see $elemMatch).
  /// </summary>
@@ -161,19 +141,6 @@ public static IMongoQuery LTE<TMember>(Expression<Func<TDocument, TMember>> memb
  return new QueryBuilder<TDocument>().LTE(memberExpression, value);
  }
 
- /// <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 static IMongoQuery Matches(Expression<Func<TDocument, string>> memberExpression, BsonRegularExpression regex)
- {
- return new QueryBuilder<TDocument>().Matches(memberExpression, regex);
- }
-
  /// <summary>
  /// Tests that the value of the named element matches a regular expression (see $regex).
  /// </summary>
@@ -187,20 +154,6 @@ public static IMongoQuery Matches(Expression<Func<TDocument, string>> memberExpr
  return new QueryBuilder<TDocument>().Matches(memberExpression, pattern);
  }
 
- /// <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="pattern">The pattern.</param>
- /// <param name="options">The options.</param>
- /// <returns>
- /// A query.
- /// </returns>
- public static IMongoQuery Matches(Expression<Func<TDocument, string>> memberExpression, string pattern, string options)
- {
- return new QueryBuilder<TDocument>().Matches(memberExpression, pattern, options);
- }
-
  /// <summary>
  /// Tests that the value of the named element matches a regular expression (see $regex).
  /// </summary>
@@ -268,16 +221,6 @@ public static IMongoQuery Near<TMember>(Expression<Func<TDocument, TMember>> mem
  return new QueryBuilder<TDocument>().Near(memberExpression, x, y, maxDistance, spherical);
  }
 
- /// <summary>
- /// Tests that the inverse of the query is true (see $not).
- /// </summary>
- /// <param name="query">The query.</param>
- /// <returns></returns>
- public static IMongoQuery Not(IMongoQuery query)
- {
- return new QueryBuilder<TDocument>().Not(query);
- }
-
  /// <summary>
  /// Tests that an element does not equal the value (see $ne).
  /// </summary>
@@ -313,30 +256,6 @@ public static IMongoQuery NotIn<TValue>(Expression<Func<TDocument, IEnumerable<T
  return new QueryBuilder<TDocument>().NotIn(memberExpression, values);
  }
 
- /// <summary>
- /// Tests that at least one of the subqueries is true (see $or).
- /// </summary>
- /// <param name="queries">The subqueries.</param>
- /// <returns>
- /// A query.
- /// </returns>
- public static IMongoQuery Or(IEnumerable<IMongoQuery> queries)
- {
- return new QueryBuilder<TDocument>().Or(queries);
- }
-
- /// <summary>
- /// Tests that at least one of the subqueries is true (see $or).
- /// </summary>
- /// <param name="queries">The subqueries.</param>
- /// <returns>
- /// A query.
- /// </returns>
- public static IMongoQuery Or(params IMongoQuery[] queries)
- {
- return new QueryBuilder<TDocument>().Or(queries);
- }
-
  /// <summary>
  /// Tests that the size of the named array is equal to some value (see $size).
  /// </summary>
@@ -361,18 +280,6 @@ public static IMongoQuery Type<TMember>(Expression<Func<TDocument, TMember>> mem
  return new QueryBuilder<TDocument>().Type(memberExpression, type);
  }
 
- /// <summary>
- /// Tests that a JavaScript expression is true (see $where).
- /// </summary>
- /// <param name="javascript">The javascript.</param>
- /// <returns>
- /// A query.
- /// </returns>
- public static IMongoQuery Where(BsonJavaScript javascript)
- {
- return new QueryBuilder<TDocument>().Where(javascript);
- }
-
  /// <summary>
  /// Builds a query from an expression.
  /// </summary>
@@ -618,20 +525,6 @@ public IMongoQuery LTE<TMember>(Expression<Func<TDocument, TMember>> memberExpre
  return Query.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 Query.Matches(serializationInfo.ElementName, regex);
- }
-
  /// <summary>
  /// Tests that the value of the named element matches a regular expression (see $regex).
  /// </summary>
@@ -646,21 +539,6 @@ public IMongoQuery Matches(Expression<Func<TDocument, string>> memberExpression,
  return Query.Matches(serializationInfo.ElementName, pattern);
  }
 
- /// <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="pattern">The pattern.</param>
- /// <param name="options">The options.</param>
- /// <returns>
- /// A query.
- /// </returns>
- public IMongoQuery Matches(Expression<Func<TDocument, string>> memberExpression, string pattern, string options)
- {
- var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
- return Query.Matches(serializationInfo.ElementName, pattern, options);
- }
-
  /// <summary>
  /// Tests that the value of the named element matches a regular expression (see $regex).
  /// </summary>

Driver/Linq/Translators/PredicateTranslator.cs

@@ -920,7 +920,7 @@ private IMongoQuery BuildStringIndexOfQuery(Expression variableExpression, Expre
 
  if (pattern != null)
  {
- return Query.Matches(serializationInfo.ElementName, pattern, "s");
+ return Query.Matches(serializationInfo.ElementName, new BsonRegularExpression(pattern, "s"));
  }
  }
 
@@ -997,7 +997,7 @@ private IMongoQuery BuildStringIndexQuery(Expression variableExpression, Express
  var pattern = string.Format("^.{{{0}}}{1}", index, characterClass);
 
  var serializationInfo = _serializationInfoHelper.GetSerializationInfo(stringExpression);
- return Query.Matches(serializationInfo.ElementName, pattern, "s");
+ return Query.Matches(serializationInfo.ElementName, new BsonRegularExpression(pattern, "s"));
  }
 
  private IMongoQuery BuildStringLengthQuery(Expression variableExpression, ExpressionType operatorType, ConstantExpression constantExpression)
@@ -1234,7 +1234,7 @@ private IMongoQuery BuildStringQuery(MethodCallExpression methodCallExpression)
 
  var serializationInfo = _serializationInfoHelper.GetSerializationInfo(stringExpression);
  var options = caseInsensitive ? "is" : "s";
- return Query.Matches(serializationInfo.ElementName, pattern, options);
+ return Query.Matches(serializationInfo.ElementName, new BsonRegularExpression(pattern, options));
  }
 
  private IMongoQuery BuildTypeComparisonQuery(Expression variableExpression, ExpressionType operatorType, ConstantExpression constantExpression)