fix: e2e tests for json

getdozer · Sep 20, 2023 · fe23da5 · fe23da5
1 parent 124d9c2
commit fe23da5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/dozer-sql/expression/src/json_functions.rs b/dozer-sql/expression/src/json_functions.rs
@@ -57,12 +57,12 @@ impl JsonFunctionType {
 
         if let Ok(json_value) = self.evaluate_json(json_input, path) {
             match json_value {
-                JsonValue::Object(_) => Ok(Field::Null),
-                JsonValue::Array(_) => Ok(Field::Null),
+                JsonValue::Object(_) => Ok(Field::Json(JsonValue::Null)),
+                JsonValue::Array(_) => Ok(Field::Json(JsonValue::Null)),
                 JsonValue::String(val) => Ok(Field::Json(JsonValue::String(val))),
                 JsonValue::Bool(val) => Ok(Field::Json(JsonValue::Bool(val))),
                 JsonValue::Number(val) => Ok(Field::Json(JsonValue::Number(val))),
-                JsonValue::Null => Ok(Field::Null),
+                JsonValue::Null => Ok(Field::Json(JsonValue::Null)),
             }
         } else {
             Ok(Field::Null)
@@ -89,10 +89,10 @@ impl JsonFunctionType {
                 match json_value {
                     JsonValue::Object(val) => Ok(Field::Json(JsonValue::Object(val))),
                     JsonValue::Array(val) => Ok(Field::Json(JsonValue::Array(val))),
-                    JsonValue::String(_) => Ok(Field::Null),
-                    JsonValue::Bool(_) => Ok(Field::Null),
-                    JsonValue::Number(_) => Ok(Field::Null),
-                    JsonValue::Null => Ok(Field::Null),
+                    JsonValue::String(_) => Ok(Field::Json(JsonValue::Null)),
+                    JsonValue::Bool(_) => Ok(Field::Json(JsonValue::Null)),
+                    JsonValue::Number(_) => Ok(Field::Json(JsonValue::Null)),
+                    JsonValue::Null => Ok(Field::Json(JsonValue::Null)),
                 }
             } else {
                 Ok(Field::Null)

diff --git a/dozer-sql/src/expression/tests/json_functions.rs b/dozer-sql/src/expression/tests/json_functions.rs
@@ -76,7 +76,7 @@ fn test_json_value_null() {
         vec![Field::Json(json_val)],
     );
 
-    assert_eq!(f, Field::Null);
+    assert_eq!(f, Field::Json(JsonValue::Null));
 }
 
 #[test]
@@ -165,7 +165,7 @@ fn test_json_query_null() {
             .clone(),
         vec![Field::Json(json_val)],
     );
-    assert_eq!(f, Field::Null);
+    assert_eq!(f, Field::Json(JsonValue::Null));
 }
 
 #[test]
@@ -687,7 +687,7 @@ fn test_json_value_diff_1() {
         vec![Field::Json(json_val)],
     );
 
-    assert_eq!(f, Field::Null);
+    assert_eq!(f, Field::Json(JsonValue::Null));
 }
 
 #[test]
@@ -737,7 +737,7 @@ fn test_json_value_diff_2() {
         vec![Field::Json(json_val)],
     );
 
-    assert_eq!(f, Field::Null);
+    assert_eq!(f, Field::Json(JsonValue::Null));
 }
 
 #[test]
@@ -763,7 +763,7 @@ fn test_json_value_diff_3() {
         vec![Field::Json(json_val.clone())],
     );
 
-    assert_eq!(f, Field::Null);
+    assert_eq!(f, Field::Json(JsonValue::Null));
 
     f = run_fct(
         "SELECT JSON_VALUE(jsonInfo,'$.y') FROM users",
@@ -807,7 +807,7 @@ fn test_json_value_diff_4() {
         vec![Field::Json(json_val.clone())],
     );
 
-    assert_eq!(f, Field::Null);
+    assert_eq!(f, Field::Json(JsonValue::Null));
 
     f = run_fct(
         "SELECT JSON_VALUE(jsonInfo,'$.z') FROM users",
@@ -851,7 +851,7 @@ fn test_json_value_diff_5() {
         vec![Field::Json(json_val.clone())],
     );
 
-    assert_eq!(f, Field::Null);
+    assert_eq!(f, Field::Json(JsonValue::Null));
 
     f = run_fct(
         "SELECT JSON_VALUE(jsonInfo,'$.x[0]') FROM users",