Skip to content

Commit 6386901

Browse files
rstamcraiggwilson
rstam
authored and
craiggwilson
committed
Rename Query to DeprecatedQuery to that we can name the new query builder Query.
1 parent f2d7bda commit 6386901

15 files changed

+3034
-2275
lines changed

‎Driver/Builders/DeprecatedQueryBuilder.cs

Lines changed: 1827 additions & 0 deletions
Large diffs are not rendered by default.

‎Driver/Builders/QueryBuilder.cs

Lines changed: 277 additions & 1316 deletions
Large diffs are not rendered by default.

‎Driver/Builders/TypedQueryBuilder.cs renamed to ‎Driver/Builders/QueryBuilderTyped.cs

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ public IMongoQuery All<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>>
482482
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
483483
var itemSerializationInfo = _serializationInfoHelper.GetItemSerializationInfo("All", serializationInfo);
484484
var serializedValues = _serializationInfoHelper.SerializeValues(itemSerializationInfo, values);
485-
return UntypedQuery.All(serializationInfo.ElementName, serializedValues);
485+
return Query.All(serializationInfo.ElementName, serializedValues);
486486
}
487487

488488
/// <summary>
@@ -492,7 +492,7 @@ public IMongoQuery All<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>>
492492
/// <returns>An IMongoQuery.</returns>
493493
public IMongoQuery And(IEnumerable<IMongoQuery> queries)
494494
{
495-
return UntypedQuery.And(queries.ToArray());
495+
return Query.And(queries.ToArray());
496496
}
497497

498498
/// <summary>
@@ -518,7 +518,7 @@ public IMongoQuery ElemMatch<TValue>(Expression<Func<TDocument, IEnumerable<TVal
518518
var itemSerializationInfo = _serializationInfoHelper.GetItemSerializationInfo("ElemMatch", serializationInfo);
519519
var elementQueryBuilder = new QueryBuilder<TValue>(_serializationInfoHelper);
520520
var elementQuery = elementQueryBuilderFunction(elementQueryBuilder);
521-
return UntypedQuery.ElemMatch(serializationInfo.ElementName, elementQuery);
521+
return Query.ElemMatch(serializationInfo.ElementName, elementQuery);
522522
}
523523

524524
/// <summary>
@@ -532,7 +532,7 @@ public IMongoQuery EQ<TMember>(Expression<Func<TDocument, TMember>> memberExpres
532532
{
533533
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
534534
var serializedValue = _serializationInfoHelper.SerializeValue(serializationInfo, value);
535-
return UntypedQuery.EQ(serializationInfo.ElementName, serializedValue);
535+
return Query.EQ(serializationInfo.ElementName, serializedValue);
536536
}
537537

538538
/// <summary>
@@ -544,7 +544,7 @@ public IMongoQuery EQ<TMember>(Expression<Func<TDocument, TMember>> memberExpres
544544
public IMongoQuery Exists<TMember>(Expression<Func<TDocument, TMember>> memberExpression)
545545
{
546546
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
547-
return UntypedQuery.Exists(serializationInfo.ElementName);
547+
return Query.Exists(serializationInfo.ElementName);
548548
}
549549

550550
/// <summary>
@@ -558,7 +558,7 @@ public IMongoQuery GT<TMember>(Expression<Func<TDocument, TMember>> memberExpres
558558
{
559559
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
560560
var serializedValue = _serializationInfoHelper.SerializeValue(serializationInfo, value);
561-
return UntypedQuery.GT(serializationInfo.ElementName, serializedValue);
561+
return Query.GT(serializationInfo.ElementName, serializedValue);
562562
}
563563

564564
/// <summary>
@@ -572,7 +572,7 @@ public IMongoQuery GTE<TMember>(Expression<Func<TDocument, TMember>> memberExpre
572572
{
573573
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
574574
var serializedValue = _serializationInfoHelper.SerializeValue(serializationInfo, value);
575-
return UntypedQuery.GTE(serializationInfo.ElementName, serializedValue);
575+
return Query.GTE(serializationInfo.ElementName, serializedValue);
576576
}
577577

578578
/// <summary>
@@ -587,7 +587,7 @@ public IMongoQuery In<TValue>(Expression<Func<TDocument, TValue>> memberExpressi
587587
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
588588
var serializedValues = _serializationInfoHelper.SerializeValues(serializationInfo, values);
589589

590-
return UntypedQuery.In(serializationInfo.ElementName, serializedValues);
590+
return Query.In(serializationInfo.ElementName, serializedValues);
591591
}
592592

593593
/// <summary>
@@ -601,7 +601,7 @@ public IMongoQuery LT<TMember>(Expression<Func<TDocument, TMember>> memberExpres
601601
{
602602
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
603603
var serializedValue = _serializationInfoHelper.SerializeValue(serializationInfo, value);
604-
return UntypedQuery.LT(serializationInfo.ElementName, serializedValue);
604+
return Query.LT(serializationInfo.ElementName, serializedValue);
605605
}
606606

607607
/// <summary>
@@ -615,7 +615,7 @@ public IMongoQuery LTE<TMember>(Expression<Func<TDocument, TMember>> memberExpre
615615
{
616616
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
617617
var serializedValue = _serializationInfoHelper.SerializeValue(serializationInfo, value);
618-
return UntypedQuery.LTE(serializationInfo.ElementName, serializedValue);
618+
return Query.LTE(serializationInfo.ElementName, serializedValue);
619619
}
620620

621621
/// <summary>
@@ -629,7 +629,7 @@ public IMongoQuery LTE<TMember>(Expression<Func<TDocument, TMember>> memberExpre
629629
public IMongoQuery Matches(Expression<Func<TDocument, string>> memberExpression, BsonRegularExpression regex)
630630
{
631631
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
632-
return UntypedQuery.Matches(serializationInfo.ElementName, regex);
632+
return Query.Matches(serializationInfo.ElementName, regex);
633633
}
634634

635635
/// <summary>
@@ -643,7 +643,7 @@ public IMongoQuery Matches(Expression<Func<TDocument, string>> memberExpression,
643643
public IMongoQuery Matches(Expression<Func<TDocument, string>> memberExpression, string pattern)
644644
{
645645
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
646-
return UntypedQuery.Matches(serializationInfo.ElementName, pattern);
646+
return Query.Matches(serializationInfo.ElementName, pattern);
647647
}
648648

649649
/// <summary>
@@ -658,7 +658,7 @@ public IMongoQuery Matches(Expression<Func<TDocument, string>> memberExpression,
658658
public IMongoQuery Matches(Expression<Func<TDocument, string>> memberExpression, string pattern, string options)
659659
{
660660
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
661-
return UntypedQuery.Matches(serializationInfo.ElementName, pattern, options);
661+
return Query.Matches(serializationInfo.ElementName, pattern, options);
662662
}
663663

664664
/// <summary>
@@ -672,7 +672,7 @@ public IMongoQuery Matches(Expression<Func<TDocument, string>> memberExpression,
672672
public IMongoQuery Matches(Expression<Func<TDocument, string>> memberExpression, Regex regex)
673673
{
674674
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
675-
return UntypedQuery.Matches(serializationInfo.ElementName, regex);
675+
return Query.Matches(serializationInfo.ElementName, regex);
676676
}
677677

678678
/// <summary>
@@ -685,7 +685,7 @@ public IMongoQuery Matches(Expression<Func<TDocument, string>> memberExpression,
685685
public IMongoQuery Mod(Expression<Func<TDocument, int>> memberExpression, int modulus, int value)
686686
{
687687
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
688-
return UntypedQuery.Mod(serializationInfo.ElementName, modulus, value);
688+
return Query.Mod(serializationInfo.ElementName, modulus, value);
689689
}
690690

691691
/// <summary>
@@ -699,7 +699,7 @@ public IMongoQuery Mod(Expression<Func<TDocument, int>> memberExpression, int mo
699699
public IMongoQuery Near<TMember>(Expression<Func<TDocument, TMember>> memberExpression, double x, double y)
700700
{
701701
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
702-
return UntypedQuery.Near(serializationInfo.ElementName, x, y);
702+
return Query.Near(serializationInfo.ElementName, x, y);
703703
}
704704

705705
/// <summary>
@@ -714,7 +714,7 @@ public IMongoQuery Near<TMember>(Expression<Func<TDocument, TMember>> memberExpr
714714
public IMongoQuery Near<TMember>(Expression<Func<TDocument, TMember>> memberExpression, double x, double y, double maxDistance)
715715
{
716716
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
717-
return UntypedQuery.Near(serializationInfo.ElementName, x, y, maxDistance);
717+
return Query.Near(serializationInfo.ElementName, x, y, maxDistance);
718718
}
719719

720720
/// <summary>
@@ -730,7 +730,7 @@ public IMongoQuery Near<TMember>(Expression<Func<TDocument, TMember>> memberExpr
730730
public IMongoQuery Near<TMember>(Expression<Func<TDocument, TMember>> memberExpression, double x, double y, double maxDistance, bool spherical)
731731
{
732732
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
733-
return UntypedQuery.Near(serializationInfo.ElementName, x, y, maxDistance, spherical);
733+
return Query.Near(serializationInfo.ElementName, x, y, maxDistance, spherical);
734734
}
735735

736736
/// <summary>
@@ -740,7 +740,7 @@ public IMongoQuery Near<TMember>(Expression<Func<TDocument, TMember>> memberExpr
740740
/// <returns></returns>
741741
public IMongoQuery Not(IMongoQuery query)
742742
{
743-
return UntypedQuery.Not(query);
743+
return Query.Not(query);
744744
}
745745

746746
/// <summary>
@@ -754,7 +754,7 @@ public IMongoQuery NE<TMember>(Expression<Func<TDocument, TMember>> memberExpres
754754
{
755755
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
756756
var serializedValue = _serializationInfoHelper.SerializeValue(serializationInfo, value);
757-
return UntypedQuery.NE(serializationInfo.ElementName, serializedValue);
757+
return Query.NE(serializationInfo.ElementName, serializedValue);
758758
}
759759

760760
/// <summary>
@@ -766,7 +766,7 @@ public IMongoQuery NE<TMember>(Expression<Func<TDocument, TMember>> memberExpres
766766
public IMongoQuery NotExists<TMember>(Expression<Func<TDocument, TMember>> memberExpression)
767767
{
768768
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
769-
return UntypedQuery.NotExists(serializationInfo.ElementName);
769+
return Query.NotExists(serializationInfo.ElementName);
770770
}
771771

772772
/// <summary>
@@ -780,7 +780,7 @@ public IMongoQuery NotIn<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>
780780
{
781781
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
782782
var serializedValues = _serializationInfoHelper.SerializeValues(serializationInfo, values);
783-
return UntypedQuery.NotIn(serializationInfo.ElementName, serializedValues);
783+
return Query.NotIn(serializationInfo.ElementName, serializedValues);
784784
}
785785

786786
/// <summary>
@@ -792,7 +792,7 @@ public IMongoQuery NotIn<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>
792792
/// </returns>
793793
public IMongoQuery Or(IEnumerable<IMongoQuery> queries)
794794
{
795-
return UntypedQuery.Or(queries);
795+
return Query.Or(queries);
796796
}
797797

798798
/// <summary>
@@ -817,7 +817,7 @@ public IMongoQuery Or(params IMongoQuery[] queries)
817817
public IMongoQuery Size<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>> memberExpression, int size)
818818
{
819819
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
820-
return UntypedQuery.Size(serializationInfo.ElementName, size);
820+
return Query.Size(serializationInfo.ElementName, size);
821821
}
822822

823823
/// <summary>
@@ -830,7 +830,7 @@ public IMongoQuery Size<TValue>(Expression<Func<TDocument, IEnumerable<TValue>>>
830830
public IMongoQuery Type<TMember>(Expression<Func<TDocument, TMember>> memberExpression, BsonType type)
831831
{
832832
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
833-
return UntypedQuery.Type(serializationInfo.ElementName, type);
833+
return Query.Type(serializationInfo.ElementName, type);
834834
}
835835

836836
/// <summary>
@@ -842,7 +842,7 @@ public IMongoQuery Type<TMember>(Expression<Func<TDocument, TMember>> memberExpr
842842
/// </returns>
843843
public IMongoQuery Where(BsonJavaScript javascript)
844844
{
845-
return UntypedQuery.Where(javascript);
845+
return Query.Where(javascript);
846846
}
847847

848848
/// <summary>
@@ -868,7 +868,7 @@ public IMongoQuery Where(Expression<Func<TDocument, bool>> expression)
868868
public IMongoQuery WithinCircle<TMember>(Expression<Func<TDocument, TMember>> memberExpression, double centerX, double centerY, double radius)
869869
{
870870
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
871-
return UntypedQuery.WithinCircle(serializationInfo.ElementName, centerX, centerY, radius);
871+
return Query.WithinCircle(serializationInfo.ElementName, centerX, centerY, radius);
872872
}
873873

874874
/// <summary>
@@ -884,7 +884,7 @@ public IMongoQuery WithinCircle<TMember>(Expression<Func<TDocument, TMember>> me
884884
public IMongoQuery WithinCircle<TMember>(Expression<Func<TDocument, TMember>> memberExpression, double centerX, double centerY, double radius, bool spherical)
885885
{
886886
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
887-
return UntypedQuery.WithinCircle(serializationInfo.ElementName, centerX, centerY, radius, spherical);
887+
return Query.WithinCircle(serializationInfo.ElementName, centerX, centerY, radius, spherical);
888888
}
889889

890890
/// <summary>
@@ -897,7 +897,7 @@ public IMongoQuery WithinCircle<TMember>(Expression<Func<TDocument, TMember>> me
897897
public IMongoQuery WithinPolygon<TMember>(Expression<Func<TDocument, TMember>> memberExpression, double[,] points)
898898
{
899899
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
900-
return UntypedQuery.WithinPolygon(serializationInfo.ElementName, points);
900+
return Query.WithinPolygon(serializationInfo.ElementName, points);
901901
}
902902

903903
/// <summary>
@@ -913,7 +913,7 @@ public IMongoQuery WithinPolygon<TMember>(Expression<Func<TDocument, TMember>> m
913913
public IMongoQuery WithinRectangle<TMember>(Expression<Func<TDocument, TMember>> memberExpression, double lowerLeftX, double lowerLeftY, double upperRightX, double upperRightY)
914914
{
915915
var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
916-
return UntypedQuery.WithinRectangle(serializationInfo.ElementName, lowerLeftX, lowerLeftY, upperRightX, upperRightY);
916+
return Query.WithinRectangle(serializationInfo.ElementName, lowerLeftX, lowerLeftY, upperRightX, upperRightY);
917917
}
918918
}
919919
}

0 commit comments

Comments
 (0)