Merge remote-tracking branch 'origin/master' into travjenkins/docs/up…

…date-title-and-descriptions
estuary · Aug 27, 2024 · 3d2189b · 3d2189b
2 parents 040cd21 + f72c01e
commit 3d2189b
Show file tree

Hide file tree

Showing 55 changed files with 781 additions and 138 deletions.
diff --git a/crates/assemble/src/lib.rs b/crates/assemble/src/lib.rs
@@ -56,7 +56,16 @@ pub fn inference(shape: &Shape, exists: Exists) -> flow::Inference {
         } else {
             None
         },
-        numeric: None,
+        numeric: if shape.type_.overlaps(types::INT_OR_FRAC) {
+            Some(flow::inference::Numeric {
+                has_minimum: shape.numeric.minimum.is_some(),
+                minimum: shape.numeric.minimum.map(Into::into).unwrap_or_default(),
+                has_maximum: shape.numeric.maximum.is_some(),
+                maximum: shape.numeric.maximum.map(Into::into).unwrap_or_default(),
+            })
+        } else {
+            None
+        },
     }
 }
 
@@ -551,7 +560,7 @@ pub fn pb_datetime(t: &time::OffsetDateTime) -> pbjson_types::Timestamp {
 #[cfg(test)]
 mod test {
     use super::*;
-    use doc::shape::StringShape;
+    use doc::shape::{NumericShape, StringShape};
     use serde_json::{json, Value};
     use std::collections::BTreeMap;
 
@@ -570,14 +579,20 @@ mod test {
                 min_length: 10,
                 max_length: Some(123),
             },
+            numeric: NumericShape {
+                minimum: None,
+                maximum: Some(json::Number::Unsigned(1000)),
+            },
             ..Shape::anything()
         };
 
         let out1 = inference(&shape, Exists::Must);
         shape.type_ = types::BOOLEAN;
         let out2 = inference(&shape, Exists::May);
+        shape.type_ = types::INTEGER | types::STRING;
+        let out3 = inference(&shape, Exists::May);
 
-        insta::assert_debug_snapshot!(&[out1, out2]);
+        insta::assert_debug_snapshot!(&[out1, out2, out3]);
     }
 
     #[test]

diff --git a/crates/assemble/src/snapshots/assemble__test__inference.snap b/crates/assemble/src/snapshots/assemble__test__inference.snap
@@ -1,6 +1,6 @@
 ---
 source: crates/assemble/src/lib.rs
-expression: "&[out1, out2]"
+expression: "&[out1, out2, out3]"
 ---
 [
     Inference {
@@ -35,4 +35,31 @@ expression: "&[out1, out2]"
         exists: May,
         numeric: None,
     },
+    Inference {
+        types: [
+            "integer",
+            "string",
+        ],
+        string: Some(
+            String {
+                content_type: "a/type",
+                format: "date-time",
+                content_encoding: "BaSE64",
+                max_length: 123,
+            },
+        ),
+        title: "the title",
+        description: "the description",
+        default_json: "{\"hello\":\"world\"}",
+        secret: true,
+        exists: May,
+        numeric: Some(
+            Numeric {
+                has_minimum: false,
+                minimum: 0.0,
+                has_maximum: true,
+                maximum: 1000.0,
+            },
+        ),
+    },
 ]
diff --git a/crates/json/src/number.rs b/crates/json/src/number.rs
@@ -67,6 +67,16 @@ impl TryFrom<Number> for serde_json::Value {
     }
 }
 
+impl Into<f64> for Number {
+    fn into(self) -> f64 {
+        match self {
+            Unsigned(n) => n as f64,
+            Signed(n) => n as f64,
+            Float(n) => n,
+        }
+    }
+}
+
 impl Ord for Number {
     fn cmp(&self, other: &Self) -> Ordering {
         match (self, other) {

diff --git a/...s/snapshots/scenario_tests__connector_validation_is_skipped_when_shards_are_disabled.snap b/...s/snapshots/scenario_tests__connector_validation_is_skipped_when_shards_are_disabled.snap
@@ -142,7 +142,14 @@ Outcome {
                                                 default_json: "",
                                                 secret: false,
                                                 exists: Must,
-                                                numeric: None,
+                                                numeric: Some(
+                                                    Numeric {
+                                                        has_minimum: false,
+                                                        minimum: 0.0,
+                                                        has_maximum: false,
+                                                        maximum: 0.0,
+                                                    },
+                                                ),
                                             },
                                         ),
                                     },
@@ -450,7 +457,14 @@ Outcome {
                                 default_json: "",
                                 secret: false,
                                 exists: Must,
-                                numeric: None,
+                                numeric: Some(
+                                    Numeric {
+                                        has_minimum: false,
+                                        minimum: 0.0,
+                                        has_maximum: false,
+                                        maximum: 0.0,
+                                    },
+                                ),
                             },
                         ),
                     },
@@ -705,7 +719,14 @@ Outcome {
                                                 default_json: "",
                                                 secret: false,
                                                 exists: Must,
-                                                numeric: None,
+                                                numeric: Some(
+                                                    Numeric {
+                                                        has_minimum: false,
+                                                        minimum: 0.0,
+                                                        has_maximum: false,
+                                                        maximum: 0.0,
+                                                    },
+                                                ),
                                             },
                                         ),
                                     },