fix(json): handle text-based JSON in json() blob arguments

Author: nunogoncalves03

core/json/mod.rs

@@ -49,10 +49,15 @@ pub fn get_json(json_value: &Value, indent: Option<&str>) -> crate::Result<Value
 
             Ok(Value::Text(Text::json(json)))
         }
-        Value::Blob(b) => {
-            let jsonbin = Jsonb::new(b.len(), Some(b));
-            jsonbin.element_type()?;
-            Ok(Value::Text(Text::json(jsonbin.to_string())))
+        Value::Blob(_) => {
+            // Blobs can contain either text JSON or binary JSONB
+            // Use convert_dbtype_to_jsonb to properly detect and parse both formats
+            let json_val = convert_dbtype_to_jsonb(json_value, Conv::Strict)?;
+            let json = match indent {
+                Some(indent) => json_val.to_string_pretty(Some(indent))?,
+                None => json_val.to_string(),
+            };
+            Ok(Value::Text(Text::json(json)))
         }
         Value::Null => Ok(Value::Null),
         _ => {
@@ -921,6 +926,54 @@ mod tests {
         }
     }
 
+    #[test]
+    fn test_get_json_blob_text_json() {
+        let true_blob = Value::Blob(b"true".to_vec());
+        let result = get_json(&true_blob, None).unwrap();
+        if let Value::Text(result_str) = result {
+            assert_eq!(result_str.as_str(), "true");
+            assert_eq!(result_str.subtype, TextSubtype::Json);
+        } else {
+            panic!("Expected Value::Text, got: {:?}", result);
+        }
+
+        let false_blob = Value::Blob(b"false".to_vec());
+        let result = get_json(&false_blob, None).unwrap();
+        if let Value::Text(result_str) = result {
+            assert_eq!(result_str.as_str(), "false");
+            assert_eq!(result_str.subtype, TextSubtype::Json);
+        } else {
+            panic!("Expected Value::Text, got: {:?}", result);
+        }
+
+        let null_blob = Value::Blob(b"null".to_vec());
+        let result = get_json(&null_blob, None).unwrap();
+        if let Value::Text(result_str) = result {
+            assert_eq!(result_str.as_str(), "null");
+            assert_eq!(result_str.subtype, TextSubtype::Json);
+        } else {
+            panic!("Expected Value::Text, got: {:?}", result);
+        }
+
+        let number_blob = Value::Blob(b"123".to_vec());
+        let result = get_json(&number_blob, None).unwrap();
+        if let Value::Text(result_str) = result {
+            assert_eq!(result_str.as_str(), "123");
+            assert_eq!(result_str.subtype, TextSubtype::Json);
+        } else {
+            panic!("Expected Value::Text, got: {:?}", result);
+        }
+
+        let string_blob = Value::Blob(b"\"hello\"".to_vec());
+        let result = get_json(&string_blob, None).unwrap();
+        if let Value::Text(result_str) = result {
+            assert_eq!(result_str.as_str(), "\"hello\"");
+            assert_eq!(result_str.subtype, TextSubtype::Json);
+        } else {
+            panic!("Expected Value::Text, got: {:?}", result);
+        }
+    }
+
     #[test]
     fn test_get_json_non_text() {
         let input = Value::Null;
@@ -994,11 +1047,7 @@ mod tests {
         let json_cache = JsonCacheCell::new();
         let blob = Value::Blob("test".as_bytes().to_vec());
         let result = json_set(
-            &[
-                Value::build_text("{}"),
-                Value::build_text("$.field"),
-                blob,
-            ],
+            &[Value::build_text("{}"), Value::build_text("$.field"), blob],
             &json_cache,
         );
 

core/json/ops.rs

@@ -482,11 +482,7 @@ mod tests {
     fn test_json_insert_blob_invalid() {
         let json_cache = JsonCacheCell::new();
         let blob = Value::Blob("test".as_bytes().to_vec());
-        let args = [
-            create_json("{}"),
-            create_text("$.field"),
-            blob,
-        ];
+        let args = [create_json("{}"), create_text("$.field"), blob];
 
         let result = json_insert(&args, &json_cache);
 

testing/json.test

@@ -148,6 +148,34 @@ do_execsql_test json5-multi-comment-pretty {
     "aaa": 123
 }}}
 
+do_execsql_test json-blob-text-true {
+   SELECT json(x'74727565');
+} {true}
+
+do_execsql_test json-blob-text-false {
+   SELECT json(x'66616c7365');
+} {false}
+
+do_execsql_test json-blob-text-null {
+   SELECT json(x'6e756c6c');
+} {null}
+
+do_execsql_test json-blob-text-number {
+   SELECT json(x'313233');
+} {123}
+
+do_execsql_test json-blob-text-string {
+   SELECT json(x'2268656c6c6f22');
+} {{"hello"}}
+
+do_execsql_test json-blob-text-array {
+   SELECT json(x'5b312c322c335d');
+} {{[1,2,3]}}
+
+do_execsql_test json-blob-text-object {
+   SELECT json(x'7b226b6579223a2276616c7565227d');
+} {{{"key":"value"}}}
+
 do_execsql_test json-pretty-ident-1 {
    SELECT json_pretty('{x: 1}', '');
 } {{{