version: 1.0.16

.env

@@ -0,0 +1,13 @@
+ENVIRONMENT=local
+DATABASE_PASSWORD=tIr4TJ0qUwGVM0rlQSe3W7Tgpi33zPbk
+DATABASE_ROLE=agreego_admin
+DATABASE_HOST=127.1.27.4
+DATABASE_PORT=5432
+POSTGRES_PASSWORD=xzIq5JT0xY3F+2m1GtnrKDdK29sNSXVVYZHPKJVh8pI=
+DATABASE_NAME=agreego
+DEV_DATABASE_NAME=agreego_dev
+GITEA_TOKEN=3d70c23673517330623a5122998fb304e3c73f0a
+MOOV_ACCOUNT_ID=69a0d2f6-77a2-4e26-934f-d869134f87d3
+MOOV_PUBLIC_KEY=9OMhK5qGnh7Tmk2Z
+MOOV_SECRET_KEY=DrRox7B-YWfO9IheiUUX7lGP8-7VY-Ni
+MOOV_DOMAIN=http://localhost

src/lib.rs

@@ -4,399 +4,169 @@ pg_module_magic!();
 
 use serde_json::{json, Value};
 use std::{collections::HashMap, sync::RwLock};
-use boon::{Compiler, Schemas, ValidationError, SchemaIndex};
+use boon::{Compiler, Schemas, ValidationError, SchemaIndex, CompileError};
 use lazy_static::lazy_static;
 
 struct BoonCache {
-    schemas: Schemas,
-    id_to_index: HashMap<String, SchemaIndex>,
+  schemas: Schemas,
+  id_to_index: HashMap<String, SchemaIndex>,
 }
 
 lazy_static! {
-    static ref SCHEMA_CACHE: RwLock<BoonCache> = RwLock::new(BoonCache {
-        schemas: Schemas::new(),
-        id_to_index: HashMap::new()
-    });
+  static ref SCHEMA_CACHE: RwLock<BoonCache> = RwLock::new(BoonCache {
+    schemas: Schemas::new(),
+    id_to_index: HashMap::new(),
+  });
 }
 
 #[pg_extern(strict)]
 fn cache_json_schema(schema_id: &str, schema: JsonB) -> JsonB {
-    let mut cache = SCHEMA_CACHE.write().unwrap();
-    let schema_value: Value = schema.0;
+  let mut cache = SCHEMA_CACHE.write().unwrap();
+  let schema_value: Value = schema.0;
+  let schema_path = format!("urn:{}", schema_id);
 
-    let mut compiler = Compiler::new();
-    compiler.enable_format_assertions();
+  let mut compiler = Compiler::new();
+  compiler.enable_format_assertions();
 
-    let schema_url = format!("urn:jspg:{}", schema_id);
+  // Use schema_path when adding the resource
+  if let Err(e) = compiler.add_resource(&schema_path, schema_value.clone()) {
+    return JsonB(json!({
+      "success": false,
+      "error": {
+        "message": format!("Failed to add schema resource '{}': {}", schema_id, e),
+        "schema_path": schema_path
+      }
+    }));
+  }
 
-    if let Err(e) = compiler.add_resource(&schema_url, schema_value) {
-        return JsonB(json!({
-            "success": false,
-            "error": format!("Failed to add schema resource '{}': {}", schema_id, e)
-        }));
+  // Use schema_path when compiling
+  match compiler.compile(&schema_path, &mut cache.schemas) {
+    Ok(sch_index) => {
+      // Store the index using the original schema_id as the key
+      cache.id_to_index.insert(schema_id.to_string(), sch_index);
+      JsonB(json!({ "success": true }))
     }
-
-    match compiler.compile(&schema_url, &mut cache.schemas) {
-        Ok(sch_index) => {
-            cache.id_to_index.insert(schema_id.to_string(), sch_index);
-            JsonB(json!({
-                "success": true,
-                "schema_id": schema_id,
-                "message": "Schema cached successfully."
-            }))
+    Err(e) => {
+      let error = match &e {
+        CompileError::ValidationError { url: _url, src } => { 
+          // Collect leaf errors from the meta-schema validation failure
+          let mut error_list = Vec::new();
+          collect_leaf_errors(src, &mut error_list);
+          // Return the flat list directly
+          json!(error_list)
         }
-        Err(e) => JsonB(json!({
-            "success": false,
-            "schema_id": schema_id,
-            "error": format!("Schema compilation failed: {}", e)
-        })),
+        _ => {
+          // Keep existing handling for other compilation errors
+          let _error_type = format!("{:?}", e).split('(').next().unwrap_or("Unknown").to_string(); 
+          json!({
+            "message": format!("Schema '{}' compilation failed: {}", schema_id, e),
+            "schema_path": schema_path,
+            "detail": format!("{:?}", e),
+          })
+        }
+      };
+      // Ensure the outer structure remains { success: false, error: ... }
+      JsonB(json!({
+        "success": false,
+        "error": error
+      }))
     }
+  }
 }
 
 #[pg_extern(strict, parallel_safe)]
 fn validate_json_schema(schema_id: &str, instance: JsonB) -> JsonB {
-    let cache = SCHEMA_CACHE.read().unwrap();
+  let cache = SCHEMA_CACHE.read().unwrap();
 
-    match cache.id_to_index.get(schema_id) {
-        None => JsonB(json!({
+  // Lookup uses the original schema_id
+  match cache.id_to_index.get(schema_id) {
+    None => JsonB(json!({
+      "success": false,
+      "error": {
+        "message": format!("Schema with id '{}' not found in cache", schema_id)
+      }
+    })),
+    Some(sch_index) => {
+      let instance_value: Value = instance.0;
+      match cache.schemas.validate(&instance_value, *sch_index) {
+        Ok(_) => JsonB(json!({ "success": true })),
+        Err(validation_error) => {
+          // Directly use the result of format_validation_error
+          // which now includes the top-level success indicator and flat error list
+          let mut error_list = Vec::new();
+          collect_leaf_errors(&validation_error, &mut error_list);
+          JsonB(json!({
             "success": false,
-            "errors": [{
-                "kind": "SchemaNotFound",
-                "message": format!("Schema with id '{}' not found in cache", schema_id)
-            }]
-        })),
-        Some(sch_index) => {
-            let instance_value: Value = instance.0;
-            match cache.schemas.validate(&instance_value, *sch_index) {
-                Ok(_) => JsonB(json!({ "success": true })),
-                Err(validation_error) => {
-                    let error_details = format_boon_errors(&validation_error);
-                    JsonB(json!({
-                        "success": false,
-                        "errors": [error_details]
-                    }))
-                }
-            }
+            "error": error_list // Flat list of specific errors
+          }))
         }
+      }
     }
+  }
 }
 
-fn format_boon_errors(error: &ValidationError) -> Value {
-    json!({
-        "instance_path": error.instance_location.to_string(),
-        "schema_path": error.schema_url.to_string(),
-        "kind": format!("{:?}", error.kind),
-        "message": format!("{}", error),
-        "causes": error
-            .causes
-            .iter()
-            .map(format_boon_errors)
-            .collect::<Vec<_>>()
-    })
+// Recursively collects leaf errors into a flat list
+fn collect_leaf_errors(error: &ValidationError, errors_list: &mut Vec<Value>) {
+  if error.causes.is_empty() {
+    let default_message = format!("{}", error);
+    let message = if let Some(start_index) = default_message.find("': ") {
+        default_message[start_index + 3..].to_string()
+    } else {
+        default_message
+    };
+
+    errors_list.push(json!({
+      "message": message,
+      "schema_path": error.schema_url.to_string(),
+      "instance_path": error.instance_location.to_string(),
+    }));
+  } else {
+    for cause in &error.causes {
+      collect_leaf_errors(cause, errors_list);
+    }
+  }
 }
 
 #[pg_extern(strict, parallel_safe)]
 fn json_schema_cached(schema_id: &str) -> bool {
-    let cache = SCHEMA_CACHE.read().unwrap();
-    cache.id_to_index.contains_key(schema_id)
+  let cache = SCHEMA_CACHE.read().unwrap();
+  cache.id_to_index.contains_key(schema_id)
 }
 
 #[pg_extern(strict)]
-fn clear_json_schemas() -> JsonB {
-    let mut cache = SCHEMA_CACHE.write().unwrap();
-    *cache = BoonCache {
-        schemas: Schemas::new(),
-        id_to_index: HashMap::new()
-    };
-    JsonB(json!({
-        "success": true,
-        "message": "Schema cache cleared."
-    }))
+fn clear_json_schemas() {
+  let mut cache = SCHEMA_CACHE.write().unwrap();
+  *cache = BoonCache {
+    schemas: Schemas::new(),
+    id_to_index: HashMap::new(),
+  };
 }
 
 #[pg_extern(strict, parallel_safe)]
-fn show_json_schemas() -> JsonB {
-    let cache = SCHEMA_CACHE.read().unwrap();
-    let ids: Vec<&String> = cache.id_to_index.keys().collect();
-    JsonB(json!({
-        "cached_schema_ids": ids
-    }))
-}
-
-#[pg_schema]
-#[cfg(any(test, feature = "pg_test"))]
-mod tests {
-    use pgrx::*;
-    use pgrx::pg_test;
-    use super::*;
-    use serde_json::json;
-
-    fn jsonb(val: Value) -> JsonB {
-        JsonB(val)
-    }
-
-    fn setup_test() {
-        clear_json_schemas();
-    }
-
-    #[pg_test]
-    fn test_cache_and_validate_json_schema() {
-        setup_test();
-        let schema_id = "my_schema";
-        let schema = json!({
-            "type": "object",
-            "properties": {
-                "name": { "type": "string" },
-                "age": { "type": "integer", "minimum": 0 }
-            },
-            "required": ["name", "age"]
-        });
-        let valid_instance = json!({ "name": "Alice", "age": 30 });
-        let invalid_instance_type = json!({ "name": "Bob", "age": -5 });
-        let invalid_instance_missing = json!({ "name": "Charlie" });
-
-        let cache_result = cache_json_schema(schema_id, jsonb(schema.clone()));
-        assert!(cache_result.0["success"].as_bool().unwrap());
-
-        let valid_result = validate_json_schema(schema_id, jsonb(valid_instance));
-        assert!(valid_result.0["success"].as_bool().unwrap());
-
-        let invalid_result_type = validate_json_schema(schema_id, jsonb(invalid_instance_type));
-        assert!(!invalid_result_type.0["success"].as_bool().unwrap());
-
-        // --- Assertions for invalid_result_type --- 
-
-        // Get top-level errors
-        let top_level_errors = invalid_result_type.0["errors"].as_array().expect("Top-level 'errors' should be an array");
-        assert_eq!(top_level_errors.len(), 1, "Should have exactly one top-level error for invalid type");
-
-        // Get the first (and only) top-level error
-        let top_level_error = top_level_errors.get(0).expect("Should get the first top-level error");
-
-        // Check top-level error kind
-        assert!(top_level_error.get("kind").and_then(Value::as_str).map_or(false, |k| k.starts_with("Schema { url:")),
-                "Incorrect kind for top-level error. Expected 'Schema {{ url:'. Error: {:?}. All errors: {:?}", top_level_error, top_level_errors);
-
-        // Get the 'causes' array from the top-level error
-        let causes_age = top_level_error.get("causes").and_then(Value::as_array).expect("Top-level error 'causes' should be an array");
-        assert_eq!(causes_age.len(), 1, "Should have one cause for the age error");
-
-        // Get the actual age error from the 'causes' array
-        let age_error = causes_age.get(0).expect("Should have an error object in 'causes'");
-        assert_eq!(age_error.get("instance_path").and_then(Value::as_str), Some("/age"),
-                   "Incorrect instance_path for age error. Error: {:?}. All errors: {:?}", age_error, top_level_errors);
-
-        assert!(age_error.get("kind").and_then(Value::as_str).map_or(false, |k| k.starts_with("Minimum { got:")),
-                "Incorrect kind prefix for age error. Expected 'Minimum {{ got:'. Error: {:?}. All errors: {:?}", age_error, top_level_errors);
-
-        let expected_prefix = "at '/age': must be >=0";
-        assert!(age_error.get("message")
-                    .and_then(Value::as_str)
-                    .map_or(false, |m| m.starts_with(expected_prefix)),
-                "Incorrect message prefix for age error. Expected prefix '{}'. Error: {:?}. All errors: {:?}",
-                expected_prefix, age_error, top_level_errors);
-
-        let invalid_result_missing = validate_json_schema(schema_id, jsonb(invalid_instance_missing));
-        assert!(!invalid_result_missing.0["success"].as_bool().unwrap(), "Validation should fail for missing required field");
-
-        // --- Assertions for invalid_result_missing --- 
-
-        // Get top-level errors
-        let top_level_errors_missing = invalid_result_missing.0["errors"].as_array().expect("Errors should be an array for missing field");
-        assert_eq!(top_level_errors_missing.len(), 1, "Should have one top-level error for missing field");
-
-        // Get the first (and only) top-level error
-        let top_error_missing = top_level_errors_missing.get(0).expect("Should get the first top-level missing field error");
-
-        // Check top-level error kind
-        assert!(top_error_missing.get("kind").and_then(Value::as_str).map_or(false, |k| k.starts_with("Schema { url:")), 
-                "Incorrect kind for missing field top-level error. Error: {:?}. All errors: {:?}", top_error_missing, top_level_errors_missing);
-
-        // Get the 'causes' array from the top-level error
-        let causes_missing = top_error_missing.get("causes").and_then(Value::as_array).expect("Causes should be an array for missing field error");
-        assert_eq!(causes_missing.len(), 1, "Should have one cause for missing field");
-
-        // Get the actual missing field error from the 'causes' array
-        let missing_error = causes_missing.get(0).expect("Should have missing field error object in 'causes'");
-
-        // Assertions on the specific missing field error
-        assert_eq!(missing_error.get("instance_path").and_then(Value::as_str), Some(""), 
-                   "Incorrect instance_path for missing age error: {:?}", missing_error);
-        assert!(missing_error.get("kind").and_then(Value::as_str).map_or(false, |k| k.starts_with("Required { want: [\"age\"]")), 
-                "Incorrect kind for missing age error. Expected prefix 'Required {{ want: [\"age\"] }}'. Error: {:?}", missing_error);
-    }
-
-    #[pg_test]
-    fn test_validate_json_schema_not_cached() {
-        setup_test();
-        let instance = json!({ "foo": "bar" });
-        let result = validate_json_schema("non_existent_schema", jsonb(instance));
-        assert!(!result.0["success"].as_bool().unwrap());
-        let errors = result.0["errors"].as_array().unwrap();
-        assert_eq!(errors.len(), 1);
-        assert_eq!(errors[0]["kind"], json!("SchemaNotFound"));
-        assert!(errors[0]["message"].as_str().unwrap().contains("non_existent_schema"));
-    }
-
-    #[pg_test]
-    fn test_cache_invalid_json_schema() {
-        setup_test();
-        let schema_id = "invalid_schema";
-        let invalid_schema_json = "{\"type\": \"string\" \"maxLength\": 5}";
-        let invalid_schema_value: Result<Value, _> = serde_json::from_str(invalid_schema_json);
-        assert!(invalid_schema_value.is_err(), "Test setup assumes invalid JSON string");
-
-        let schema_representing_invalid = json!({
-            "type": 123
-        });
-
-        let result = cache_json_schema(schema_id, jsonb(schema_representing_invalid.clone()));
-        assert!(!result.0["success"].as_bool().unwrap());
-        assert!(result.0["error"].as_str().unwrap().contains("Schema compilation failed"));
-    }
-
-    #[pg_test]
-    fn test_validate_json_schema_detailed_validation_errors() {
-        setup_test();
-        let schema_id = "detailed_schema";
-        let schema = json!({
-            "type": "object",
-            "properties": {
-                "address": {
-                    "type": "object",
-                    "properties": {
-                        "street": { "type": "string" },
-                        "city": { "type": "string", "maxLength": 10 }
-                    },
-                    "required": ["street", "city"]
-                }
-            },
-            "required": ["address"]
-        });
-        let invalid_instance = json!({
-            "address": {
-                "city": "San Francisco Bay Area"
-            }
-        });
-
-        assert!(cache_json_schema(schema_id, jsonb(schema.clone())).0["success"].as_bool().unwrap());
-        let result = validate_json_schema(schema_id, jsonb(invalid_instance));
-        assert!(!result.0["success"].as_bool().unwrap());
-
-        let errors = result.0["errors"].as_array().expect("Errors should be an array");
-        let top_error = errors.get(0).expect("Expected at least one top-level error object");
-        let causes = top_error.get("causes").and_then(Value::as_array).expect("Expected causes array");
-
-        let has_required_street_error = causes.iter().any(|e|
-            e.get("instance_path").and_then(Value::as_str) == Some("/address") && // Check path inside cause
-            e.get("kind").and_then(Value::as_str).unwrap_or("").starts_with("Required { want:") && // Check kind prefix
-            e.get("kind").and_then(Value::as_str).unwrap_or("").contains("street") // Ensure 'street' is mentioned
-        );
-        assert!(has_required_street_error, "Missing required 'street' error within causes. Actual errors: {:?}", errors);
-
-        let has_maxlength_city_error = causes.iter().any(|e| // Check within causes
-            e.get("instance_path").and_then(Value::as_str) == Some("/address/city") &&
-            e.get("kind").and_then(Value::as_str).unwrap_or("").starts_with("MaxLength { got:") // Check kind prefix
-        );
-        assert!(has_maxlength_city_error, "Missing maxLength 'city' error within causes. Actual errors: {:?}", errors);
-    }
-
-    #[pg_test]
-    fn test_validate_json_schema_oneof_validation_errors() {
-        setup_test();
-        let schema_id = "oneof_schema";
-        let schema = json!({
-            "type": "object",
-            "properties": {
-                "value": {
-                    "oneOf": [
-                        { "type": "string", "minLength": 5 },
-                        { "type": "number", "minimum": 10 }
-                    ]
-                }
-            },
-            "required": ["value"]
-        });
-        assert!(cache_json_schema(schema_id, jsonb(schema.clone())).0["success"].as_bool().unwrap());
-
-        let invalid_instance = json!({ "value": "abc" });
-        let result = validate_json_schema(schema_id, jsonb(invalid_instance));
-
-        assert!(!result.0["success"].as_bool().unwrap());
-
-        let errors_val = result.0["errors"].as_array().expect("Errors should be an array");
-        let top_schema_error = errors_val.get(0).expect("Expected at least one top-level Schema error object");
-        let schema_error_causes = top_schema_error.get("causes").and_then(Value::as_array).expect("Expected causes array for Schema error");
-
-        let oneof_error = schema_error_causes.iter().find(|e| {
-            e.get("kind").and_then(Value::as_str) == Some("OneOf(None)") &&
-            e.get("instance_path").and_then(Value::as_str) == Some("/value")
-        }).expect("Could not find the OneOf(None) error for /value within Schema causes");
-
-        let oneof_causes = oneof_error.get("causes").and_then(Value::as_array)
-            .expect("Expected causes array for OneOf error");
-
-        let has_minlength_error = oneof_causes.iter().any(|e| // Check within OneOf causes
-            e.get("instance_path").and_then(Value::as_str) == Some("/value") &&
-            e.get("kind").and_then(Value::as_str).unwrap_or("").starts_with("MinLength { got:") // Check kind prefix
-        );
-        assert!(has_minlength_error, "Missing MinLength error within OneOf causes. Actual errors: {:?}", errors_val);
-
-        let has_type_error = oneof_causes.iter().any(|e| // Check within OneOf causes
-            e.get("instance_path").and_then(Value::as_str) == Some("/value") &&
-            e.get("kind").and_then(Value::as_str).unwrap_or("").starts_with("Type { got: String, want: Types") // More specific kind check
-        );
-        assert!(has_type_error, "Missing Type error within OneOf causes. Actual errors: {:?}", errors_val);
-    }
-
-    #[pg_test]
-    fn test_clear_json_schemas() {
-        setup_test();
-        let schema_id = "schema_to_clear";
-        let schema = json!({ "type": "string" });
-        cache_json_schema(schema_id, jsonb(schema.clone()));
-
-        let show_result1 = show_json_schemas();
-        assert!(show_result1.0["cached_schema_ids"].as_array().unwrap().iter().any(|id| id.as_str() == Some(schema_id)));
-
-        let clear_result = clear_json_schemas();
-        assert!(clear_result.0["success"].as_bool().unwrap());
-
-        let show_result2 = show_json_schemas();
-        assert!(show_result2.0["cached_schema_ids"].as_array().unwrap().is_empty());
-
-        let instance = json!("test");
-        let validate_result = validate_json_schema(schema_id, jsonb(instance));
-        assert!(!validate_result.0["success"].as_bool().unwrap());
-        assert_eq!(validate_result.0["errors"].as_array().unwrap()[0]["kind"], json!("SchemaNotFound"));
-    }
-
-    #[pg_test]
-    fn test_show_json_schemas() {
-        setup_test();
-        let schema_id1 = "schema1";
-        let schema_id2 = "schema2";
-        let schema = json!({ "type": "boolean" });
-
-        cache_json_schema(schema_id1, jsonb(schema.clone()));
-        cache_json_schema(schema_id2, jsonb(schema.clone()));
-
-        let result = show_json_schemas();
-        let ids = result.0["cached_schema_ids"].as_array().unwrap();
-        assert_eq!(ids.len(), 2);
-        assert!(ids.contains(&json!(schema_id1)));
-        assert!(ids.contains(&json!(schema_id2)));
-    }
+fn show_json_schemas() -> Vec<String> {
+  let cache = SCHEMA_CACHE.read().unwrap();
+  let ids: Vec<String> = cache.id_to_index.keys().cloned().collect();
+  ids
 }
 
+/// This module is required by `cargo pgrx test` invocations.
+/// It must be visible at the root of your extension crate.
 #[cfg(test)]
 pub mod pg_test {
-    pub fn setup(_options: Vec<&str>) {
-        // perform one-off initialization when the pg_test framework starts
-    }
+  pub fn setup(_options: Vec<&str>) {
+    // perform one-off initialization when the pg_test framework starts
+  }
 
-    pub fn postgresql_conf_options() -> Vec<&'static str> {
-        // return any postgresql.conf settings that are required for your tests
-        vec![]
-    }
+  #[must_use]
+  pub fn postgresql_conf_options() -> Vec<&'static str> {
+    // return any postgresql.conf settings that are required for your tests
+    vec![]
+  }
+}
+
+
+#[cfg(any(test, feature = "pg_test"))]
+#[pg_schema]
+mod tests {
+  include!("tests.rs");
 }

src/tests.rs

@@ -0,0 +1,400 @@
+use crate::*;
+use serde_json::{json, Value};
+use pgrx::{JsonB, pg_test}; 
+
+// Helper macro for asserting success (no changes needed, but ensure it's present)
+macro_rules! assert_success_with_json {
+  ($result_jsonb:expr, $fmt:literal $(, $($args:tt)*)?) => {
+    let condition_result: Option<bool> = $result_jsonb.0.get("success").and_then(Value::as_bool);
+    if condition_result != Some(true) {
+      let base_msg = format!($fmt $(, $($args)*)?);
+      let pretty_json = serde_json::to_string_pretty(&$result_jsonb.0)
+        .unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", $result_jsonb.0));
+      let panic_msg = format!("Assertion Failed (expected success): {}\nResult JSON:\n{}", base_msg, pretty_json);
+      panic!("{}", panic_msg);
+    }
+  };
+  // Simpler version without message
+  ($result_jsonb:expr) => {
+    let condition_result: Option<bool> = $result_jsonb.0.get("success").and_then(Value::as_bool);
+    if condition_result != Some(true) {
+      let pretty_json = serde_json::to_string_pretty(&$result_jsonb.0)
+        .unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", $result_jsonb.0));
+      let panic_msg = format!("Assertion Failed (expected success)\nResult JSON:\n{}", pretty_json);
+      panic!("{}", panic_msg);
+    }
+  };
+}
+
+// Updated helper macro for asserting failed JSON results with the new flat error structure
+macro_rules! assert_failure_with_json {
+  // --- Arms with error count and message substring check ---
+  // With custom message:
+  ($result:expr, $expected_error_count:expr, $expected_first_message_contains:expr, $fmt:literal $(, $($args:tt)*)?) => {
+    let json_result = &$result.0;
+    let success = json_result.get("success").and_then(Value::as_bool);
+    let error_val_opt = json_result.get("error"); // Changed key
+    let base_msg = format!($fmt $(, $($args)*)?);
+
+    if success != Some(false) {
+      let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+      panic!("Assertion Failed (expected failure, success was not false): {}\nResult JSON:\n{}", base_msg, pretty_json);
+    }
+    match error_val_opt {
+      Some(error_val) => {
+        if error_val.is_array() {
+          let errors_array = error_val.as_array().unwrap();
+          if errors_array.len() != $expected_error_count {
+            let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+            panic!("Assertion Failed (wrong error count): Expected {} errors, got {}. {}\nResult JSON:\n{}", $expected_error_count, errors_array.len(), base_msg, pretty_json);
+          }
+          if $expected_error_count > 0 {
+            let first_error_message = errors_array[0].get("message").and_then(Value::as_str);
+            match first_error_message {
+              Some(msg) => {
+                if !msg.contains($expected_first_message_contains) {
+                  let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+                  panic!("Assertion Failed (first error message mismatch): Expected contains '{}', got: '{}'. {}\nResult JSON:\n{}", $expected_first_message_contains, msg, base_msg, pretty_json);
+                }
+              }
+              None => {
+                let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+                panic!("Assertion Failed (first error in array has no 'message' string): {}\nResult JSON:\n{}", base_msg, pretty_json);
+              }
+            }
+          }
+        } else if error_val.is_object() {
+            // Handle single error object case (like 'schema not found')
+            if $expected_error_count != 1 {
+              let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+              panic!("Assertion Failed (wrong error count): Expected {} errors, but got a single error object. {}\nResult JSON:\n{}", $expected_error_count, base_msg, pretty_json);
+            }
+            let message = error_val.get("message").and_then(Value::as_str);
+            match message {
+              Some(msg) => {
+                if !msg.contains($expected_first_message_contains) {
+                  let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+                  panic!("Assertion Failed (error message mismatch): Expected object message contains '{}', got: '{}'. {}\nResult JSON:\n{}", $expected_first_message_contains, msg, base_msg, pretty_json);
+                }
+              }
+              None => {
+                let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+                panic!("Assertion Failed (error object has no 'message' string): {}\nResult JSON:\n{}", base_msg, pretty_json);
+              }
+            }
+        } else {
+            let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+            panic!("Assertion Failed ('error' value is not an array or object): {}\nResult JSON:\n{}", base_msg, pretty_json);
+        }
+      }
+      None => {
+         let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+         panic!("Assertion Failed (expected 'error' key, but none found): {}\nResult JSON:\n{}", base_msg, pretty_json);
+      }
+    }
+  };
+  // Without custom message (calls the one above with ""):
+  ($result:expr, $expected_error_count:expr, $expected_first_message_contains:expr) => {
+    assert_failure_with_json!($result, $expected_error_count, $expected_first_message_contains, "");
+  };
+
+  // --- Arms with error count check only ---
+  // With custom message:
+  ($result:expr, $expected_error_count:expr, $fmt:literal $(, $($args:tt)*)?) => {
+    let json_result = &$result.0;
+    let success = json_result.get("success").and_then(Value::as_bool);
+    let error_val_opt = json_result.get("error"); // Changed key
+    let base_msg = format!($fmt $(, $($args)*)?);
+
+    if success != Some(false) {
+      let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+      panic!("Assertion Failed (expected failure, success was not false): {}\nResult JSON:\n{}", base_msg, pretty_json);
+    }
+     match error_val_opt {
+      Some(error_val) => {
+        if error_val.is_array() {
+            let errors_array = error_val.as_array().unwrap();
+            if errors_array.len() != $expected_error_count {
+                let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+                panic!("Assertion Failed (wrong error count): Expected {} errors, got {}. {}\nResult JSON:\n{}", $expected_error_count, errors_array.len(), base_msg, pretty_json);
+            }
+        } else if error_val.is_object() {
+            if $expected_error_count != 1 {
+                let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+                panic!("Assertion Failed (wrong error count): Expected {} errors, but got a single error object. {}\nResult JSON:\n{}", $expected_error_count, base_msg, pretty_json);
+            }
+            // Count check passes if expected is 1 and got object
+        } else {
+            let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+            panic!("Assertion Failed ('error' value is not an array or object): {}\nResult JSON:\n{}", base_msg, pretty_json);
+        }
+      }
+      None => {
+         let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+         panic!("Assertion Failed (expected 'error' key, but none found): {}\nResult JSON:\n{}", base_msg, pretty_json);
+      }
+    }
+  };
+  // Without custom message (calls the one above with ""):
+  ($result:expr, $expected_error_count:expr) => {
+    assert_failure_with_json!($result, $expected_error_count, "");
+  };
+
+  // --- Arms checking failure only (expects at least one error) ---
+  // With custom message:
+  ($result:expr, $fmt:literal $(, $($args:tt)*)?) => {
+    let json_result = &$result.0;
+    let success = json_result.get("success").and_then(Value::as_bool);
+    let error_val_opt = json_result.get("error"); // Changed key
+    let base_msg = format!($fmt $(, $($args)*)?);
+
+    if success != Some(false) {
+      let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+      panic!("Assertion Failed (expected failure, success was not false): {}\nResult JSON:\n{}", base_msg, pretty_json);
+    }
+    match error_val_opt {
+      Some(error_val) => {
+        if error_val.is_object() {
+          // OK: single error object is a failure
+        } else if error_val.is_array() {
+          if error_val.as_array().unwrap().is_empty() {
+            let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+            panic!("Assertion Failed (expected errors, but 'error' array is empty): {}\nResult JSON:\n{}", base_msg, pretty_json);
+          }
+          // OK: non-empty error array is a failure
+        } else {
+           let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+           panic!("Assertion Failed ('error' value is not an array or object): {}\nResult JSON:\n{}", base_msg, pretty_json);
+        }
+      }
+      None => {
+         let pretty_json = serde_json::to_string_pretty(&json_result).unwrap_or_else(|_| format!("(Failed to pretty-print JSON: {:?})", json_result));
+         panic!("Assertion Failed (expected 'error' key, but none found): {}\nResult JSON:\n{}", base_msg, pretty_json);
+      }
+    }
+  };
+  // Without custom message (calls the one above with ""):
+  ($result:expr) => {
+    assert_failure_with_json!($result, "");
+  };
+}
+
+
+fn jsonb(val: Value) -> JsonB {
+  JsonB(val)
+}
+
+#[pg_test]
+fn test_cache_and_validate_json_schema() {
+  clear_json_schemas(); // Call clear directly
+  let schema_id = "my_schema";
+  let schema = json!({
+    "type": "object",
+    "properties": {
+      "name": { "type": "string" },
+      "age": { "type": "integer", "minimum": 0 }
+    },
+    "required": ["name", "age"]
+  });
+  let valid_instance = json!({ "name": "Alice", "age": 30 });
+  let invalid_instance_type = json!({ "name": "Bob", "age": -5 });
+  let invalid_instance_missing = json!({ "name": "Charlie" });
+
+  let cache_result = cache_json_schema(schema_id, jsonb(schema.clone()));
+  assert_success_with_json!(cache_result, "Cache operation should succeed.");
+
+  let valid_result = validate_json_schema(schema_id, jsonb(valid_instance));
+  assert_success_with_json!(valid_result, "Validation of valid instance should succeed.");
+
+  // Invalid type
+  let invalid_result_type = validate_json_schema(schema_id, jsonb(invalid_instance_type));
+  assert_failure_with_json!(invalid_result_type, 1, "must be >=0", "Validation with invalid type should fail.");
+  let errors_type = invalid_result_type.0["error"].as_array().unwrap(); // Check 'error', expect array
+  assert_eq!(errors_type[0]["instance_path"], "/age");
+  assert_eq!(errors_type[0]["schema_path"], "urn:my_schema#/properties/age");
+
+  // Missing field
+  let invalid_result_missing = validate_json_schema(schema_id, jsonb(invalid_instance_missing));
+  assert_failure_with_json!(invalid_result_missing, 1, "missing properties 'age'", "Validation with missing field should fail.");
+  let errors_missing = invalid_result_missing.0["error"].as_array().unwrap(); // Check 'error', expect array
+  assert_eq!(errors_missing[0]["instance_path"], "");
+  assert_eq!(errors_missing[0]["schema_path"], "urn:my_schema#");
+
+  // Schema not found
+  let non_existent_id = "non_existent_schema";
+  let invalid_schema_result = validate_json_schema(non_existent_id, jsonb(json!({})));
+  assert_failure_with_json!(invalid_schema_result, 1, "Schema with id 'non_existent_schema' not found", "Validation with non-existent schema should fail.");
+  // Check 'error' is an object for 'schema not found'
+  let error_notfound_obj = invalid_schema_result.0["error"].as_object().expect("'error' should be an object for schema not found");
+  assert!(error_notfound_obj.contains_key("message")); // Check message exists
+  // Removed checks for schema_path/instance_path as they aren't added in lib.rs for this case
+}
+
+#[pg_test]
+fn test_validate_json_schema_not_cached() {
+  clear_json_schemas(); // Call clear directly
+  let instance = json!({ "foo": "bar" });
+  let result = validate_json_schema("non_existent_schema", jsonb(instance));
+  // Use the updated macro, expecting count 1 and specific message (handles object case)
+  assert_failure_with_json!(result, 1, "Schema with id 'non_existent_schema' not found", "Validation with non-existent schema should fail.");
+}
+
+#[pg_test]
+fn test_cache_invalid_json_schema() {
+  clear_json_schemas(); // Call clear directly
+  let schema_id = "invalid_schema";
+  // Schema with an invalid type *value*
+  let invalid_schema = json!({
+    "$id": "urn:invalid_schema",
+    "type": ["invalid_type_value"] 
+  });
+
+  let cache_result = cache_json_schema(schema_id, jsonb(invalid_schema));
+
+  // Expect 2 leaf errors because the meta-schema validation fails at the type value
+  // and within the type array itself.
+  assert_failure_with_json!(
+    cache_result,
+    2, // Expect exactly two leaf errors
+    "value must be one of", // Check message substring (present in both)
+    "Caching invalid schema should fail with specific meta-schema validation errors."
+  );
+
+  // Ensure the error is an array and check specifics
+  let error_array = cache_result.0["error"].as_array().expect("Error field should be an array");
+  assert_eq!(error_array.len(), 2);
+  // Note: Order might vary depending on boon's internal processing, check both possibilities or sort.
+  // Assuming the order shown in the logs for now:
+  assert_eq!(error_array[0]["instance_path"], "/type");
+  assert!(error_array[0]["message"].as_str().unwrap().contains("value must be one of"));
+  assert_eq!(error_array[1]["instance_path"], "/type/0");
+  assert!(error_array[1]["message"].as_str().unwrap().contains("value must be one of"));
+}
+
+#[pg_test]
+fn test_validate_json_schema_detailed_validation_errors() {
+  clear_json_schemas(); // Call clear directly
+  let schema_id = "detailed_errors";
+  let schema = json!({
+    "type": "object",
+    "properties": {
+      "address": {
+        "type": "object",
+        "properties": {
+          "street": { "type": "string" },
+          "city": { "type": "string", "maxLength": 10 }
+        },
+        "required": ["street", "city"]
+      }
+    },
+    "required": ["address"]
+  });
+  let _ = cache_json_schema(schema_id, jsonb(schema));
+
+  let invalid_instance = json!({
+    "address": {
+      "street": 123, // Wrong type
+      "city": "Supercalifragilisticexpialidocious" // Too long
+    }
+  });
+
+  let result = validate_json_schema(schema_id, jsonb(invalid_instance));
+
+  // Update: Expect 2 errors again, as boon reports both nested errors.
+  assert_failure_with_json!(result, 2);
+
+}
+
+#[pg_test]
+fn test_validate_json_schema_oneof_validation_errors() {
+  clear_json_schemas(); // Call clear directly
+  let schema_id = "oneof_schema";
+  let schema = json!({
+    "oneOf": [
+      { // Option 1: Object with string prop
+        "type": "object",
+        "properties": {
+          "string_prop": { "type": "string", "maxLength": 5 }
+        },
+        "required": ["string_prop"]
+      },
+      { // Option 2: Object with number prop
+        "type": "object",
+        "properties": {
+          "number_prop": { "type": "number", "minimum": 10 }
+        },
+        "required": ["number_prop"]
+      }
+    ]
+  });
+
+  let _ = cache_json_schema(schema_id, jsonb(schema));
+
+  // --- Test case 1: Fails string maxLength (in branch 0) AND missing number_prop (in branch 1) ---
+  let invalid_string_instance = json!({ "string_prop": "toolongstring" });
+  let result_invalid_string = validate_json_schema(schema_id, jsonb(invalid_string_instance));
+  // Expect 2 leaf errors: one for maxLength (branch 0), one for missing prop (branch 1)
+  // Check the first error message reported by boon (maxLength).
+  assert_failure_with_json!(result_invalid_string, 2, "length must be <=5", "Validation with invalid string length should have 2 leaf errors");
+
+  // --- Test case 2: Fails number minimum (in branch 1) AND missing string_prop (in branch 0) ---
+  let invalid_number_instance = json!({ "number_prop": 5 });
+  let result_invalid_number = validate_json_schema(schema_id, jsonb(invalid_number_instance));
+  // Expect 2 leaf errors: one for minimum (branch 1), one for missing prop (branch 0)
+  // Check the first error message reported by boon (missing prop).
+  assert_failure_with_json!(result_invalid_number, 2, "missing properties 'string_prop'", "Validation with invalid number should have 2 leaf errors");
+
+  // --- Test case 3: Fails type check (not object) for both branches ---
+  // Input: boolean, expected object for both branches
+  let invalid_bool_instance = json!(true); // Not an object
+  let result_invalid_bool = validate_json_schema(schema_id, jsonb(invalid_bool_instance));
+  // Expect 2 leaf errors, one "Type" error for each branch
+  // Check the first error reported by boon (want object).
+  assert_failure_with_json!(result_invalid_bool, 2, "want object", "Validation with invalid bool should have 2 leaf errors");
+
+  // --- Test case 4: Fails missing required for both branches ---
+  // Input: empty object, expected string_prop (branch 0) OR number_prop (branch 1)
+  let invalid_empty_obj = json!({});
+  let result_empty_obj = validate_json_schema(schema_id, jsonb(invalid_empty_obj));
+  // Expect 2 leaf errors: one required error for branch 0, one required error for branch 1
+  // Check the first error reported by boon (missing string_prop).
+  assert_failure_with_json!(result_empty_obj, 2, "missing properties 'string_prop'", "Validation with empty object should have 2 leaf errors");
+}
+
+#[pg_test]
+fn test_clear_json_schemas() {
+  clear_json_schemas(); // Call clear directly
+  let schema_id = "schema_to_clear";
+  let schema = json!({ "type": "string" });
+  cache_json_schema(schema_id, jsonb(schema.clone()));
+
+  let show_result1 = show_json_schemas(); 
+  assert!(show_result1.contains(&schema_id.to_string())); 
+
+  clear_json_schemas(); 
+
+  let show_result2 = show_json_schemas(); 
+  assert!(show_result2.is_empty());   
+
+  let instance = json!("test");
+  let validate_result = validate_json_schema(schema_id, jsonb(instance));
+  // Use the updated macro, expecting count 1 and specific message (handles object case)
+  assert_failure_with_json!(validate_result, 1, "Schema with id 'schema_to_clear' not found", "Validation should fail after clearing schemas.");
+}
+
+#[pg_test]
+fn test_show_json_schemas() {
+  clear_json_schemas(); // Call clear directly
+  let schema_id1 = "schema1";
+  let schema_id2 = "schema2";
+  let schema = json!({ "type": "boolean" });
+
+  cache_json_schema(schema_id1, jsonb(schema.clone()));
+  cache_json_schema(schema_id2, jsonb(schema.clone()));
+
+  let mut result = show_json_schemas(); // Make result mutable
+  result.sort(); // Sort for deterministic testing
+  assert_eq!(result, vec!["schema1".to_string(), "schema2".to_string()]); // Check exact content
+  assert!(result.contains(&schema_id1.to_string())); // Keep specific checks too if desired
+  assert!(result.contains(&schema_id2.to_string()));
+}

version

@@ -1 +1 @@
-1.0.10
+1.0.16