hasura · hallettj · Jun 12, 2024 · Jun 5, 2024 · Jun 5, 2024 · Jun 6, 2024
diff --git a/.../integration-tests/src/tests/snapshots/integration_tests__tests__basic__runs_a_query.snap b/.../integration-tests/src/tests/snapshots/integration_tests__tests__basic__runs_a_query.snap
@@ -6,52 +6,42 @@ data:
   movies:
     - title: Blacksmith Scene
       imdb:
-        rating:
-          $numberDouble: "6.2"
+        rating: 6.2
         votes: 1189
     - title: The Great Train Robbery
       imdb:
-        rating:
-          $numberDouble: "7.4"
+        rating: 7.4
         votes: 9847
     - title: The Land Beyond the Sunset
       imdb:
-        rating:
-          $numberDouble: "7.1"
+        rating: 7.1
         votes: 448
     - title: A Corner in Wheat
       imdb:
-        rating:
-          $numberDouble: "6.6"
+        rating: 6.6
         votes: 1375
     - title: "Winsor McCay, the Famous Cartoonist of the N.Y. Herald and His Moving Comics"
       imdb:
-        rating:
-          $numberDouble: "7.3"
+        rating: 7.3
         votes: 1034
     - title: Traffic in Souls
       imdb:
-        rating:
-          $numberInt: "6"
+        rating: 6
         votes: 371
     - title: Gertie the Dinosaur
       imdb:
-        rating:
-          $numberDouble: "7.3"
+        rating: 7.3
         votes: 1837
     - title: In the Land of the Head Hunters
       imdb:
-        rating:
-          $numberDouble: "5.8"
+        rating: 5.8
         votes: 223
     - title: The Perils of Pauline
       imdb:
-        rating:
-          $numberDouble: "7.6"
+        rating: 7.6
         votes: 744
     - title: The Birth of a Nation
       imdb:
-        rating:
-          $numberDouble: "6.8"
+        rating: 6.8
         votes: 15715
 errors: ~
diff --git a/crates/mongodb-agent-common/src/comparison_function.rs b/crates/mongodb-agent-common/src/comparison_function.rs
@@ -57,8 +57,8 @@ impl ComparisonFunction {
             .ok_or(QueryPlanError::UnknownComparisonOperator(s.to_owned()))
     }
 
-    /// Produce a MongoDB expression that applies this function to the given operands.
-    pub fn mongodb_expression(
+    /// Produce a MongoDB expression for use in a match query that applies this function to the given operands.
+    pub fn mongodb_match_query(
         self,
         column_ref: impl Into<String>,
         comparison_value: Bson,
@@ -70,4 +70,22 @@ impl ComparisonFunction {
             _ => doc! { column_ref: { self.mongodb_name(): comparison_value } },
         }
     }
+
+    /// Produce a MongoDB expression for use in an aggregation expression that applies this
+    /// function to the given operands.
+    pub fn mongodb_aggregation_expression(
+        self,
+        column_ref: impl Into<Bson>,
+        comparison_value: impl Into<Bson>,
+    ) -> Document {
+        match self {
+            C::Regex => {
+                doc! { "$regexMatch": { "input": column_ref, "regex": comparison_value } }
+            }
+            C::IRegex => {
+                doc! { "$regexMatch": { "input": column_ref, "regex": comparison_value, "options": "i" } }
+            }
+            _ => doc! { self.mongodb_name(): [column_ref, comparison_value] },
+        }
+    }
 }
diff --git a/crates/mongodb-agent-common/src/mongodb/sanitize.rs b/crates/mongodb-agent-common/src/mongodb/sanitize.rs
@@ -9,6 +9,8 @@ use crate::interface_types::MongoAgentError;
 
 /// Produces a MongoDB expression that references a field by name in a way that is safe from code
 /// injection.
+///
+/// TODO: equivalent to ColumnRef::Expression
 pub fn get_field(name: &str) -> Document {
     doc! { "$getField": { "$literal": name } }
 }
@@ -33,10 +35,16 @@ pub fn variable(name: &str) -> Result<String, MongoAgentError> {
     }
 }
 
+/// Returns false if the name contains characters that MongoDB will interpret specially, such as an
+/// initial dollar sign, or dots.
+pub fn is_name_safe(name: &str) -> bool {
+    !(name.starts_with('$') || name.contains('.'))
+}
+
 /// Given a collection or field name, returns Ok if the name is safe, or Err if it contains
 /// characters that MongoDB will interpret specially.
 ///
-/// TODO: Can we handle names with dots or dollar signs safely instead of throwing an error?
+/// TODO: MDB-159, MBD-160 remove this function in favor of ColumnRef which is infallible
 pub fn safe_name(name: &str) -> Result<Cow<str>, MongoAgentError> {
     if name.starts_with('$') || name.contains('.') {
         Err(MongoAgentError::BadQuery(anyhow!("cannot execute query that includes the name, \"{name}\", because it includes characters that MongoDB interperets specially")))