SERVER-30731 Add expr support in MatchExpression outside of aggregation

2 files changed, 18 insertions, 2 deletions

diff --git a/jstests/aggregation/sources/graphLookup/error.js b/jstests/aggregation/sources/graphLookup/error.js
index 143ea5bc31f..20dad85b842 100644
--- a/jstests/aggregation/sources/graphLookup/error.js
+++ b/jstests/aggregation/sources/graphLookup/error.js
@@ -302,10 +302,10 @@ load("jstests/aggregation/extras/utils.js");  // For "assertErrorCode".
             connectToField: "a",
             connectFromField: "b",
             as: "output",
-            restrictSearchWithMatch: {$expr: {$eq: ["$x", 5]}}
+            restrictSearchWithMatch: {$expr: {$eq: ["$x", "$$unbound"]}}
         }
     };
-    assertErrorCode(local, pipeline, 40186, "cannot use $expr inside $graphLookup");
+    assertErrorCode(local, pipeline, 17276, "cannot use $expr with unbound variable");
 
     // $graphLookup can only consume at most 100MB of memory.
     var foreign = db.foreign;
diff --git a/jstests/aggregation/sources/graphLookup/filter.js b/jstests/aggregation/sources/graphLookup/filter.js
index 15ff6d4a4ae..b6eaff41b25 100644
--- a/jstests/aggregation/sources/graphLookup/filter.js
+++ b/jstests/aggregation/sources/graphLookup/filter.js
@@ -75,4 +75,20 @@
               .toArray()[0];
 
     assert.eq(res.results.length, 1);
+
+    // $expr is allowed inside the 'restrictSearchWithMatch' match expression.
+    // TODO SERVER-31029: This should not throw once support is added for top-level $expr within $or
+    // and $and.
+    assert.throws(function() {
+        local.aggregate({
+            $graphLookup: {
+                from: "foreign",
+                startWith: "$starting",
+                connectFromField: "to",
+                connectToField: "from",
+                as: "results",
+                restrictSearchWithMatch: {$expr: {$eq: ["$shouldBeIncluded", true]}}
+            }
+        });
+    });
 })();