more pg try catching and error handling

src/merger/mod.rs

@@ -45,12 +45,33 @@ impl Merger {
     let val_resolved = match result {
       Ok(val) => val,
       Err(msg) => {
+        let mut final_code = "MERGE_FAILED".to_string();
+        let mut final_message = msg.clone();
+        let mut final_cause = None;
+
+        if let Ok(Value::Object(map)) = serde_json::from_str::<Value>(&msg) {
+          if let (Some(Value::String(e_msg)), Some(Value::String(e_code))) = (map.get("error"), map.get("code")) {
+            final_message = e_msg.clone();
+            final_code = e_code.clone();
+            let mut cause_parts = Vec::new();
+            if let Some(Value::String(d)) = map.get("detail") {
+              if !d.is_empty() { cause_parts.push(d.clone()); }
+            }
+            if let Some(Value::String(h)) = map.get("hint") {
+              if !h.is_empty() { cause_parts.push(h.clone()); }
+            }
+            if !cause_parts.is_empty() {
+                final_cause = Some(cause_parts.join("\n"));
+            }
+          }
+        }
+
         return crate::drop::Drop::with_errors(vec![crate::drop::Error {
-          code: "MERGE_FAILED".to_string(),
-          message: msg,
+          code: final_code,
+          message: final_message,
           details: crate::drop::ErrorDetails {
             path: "".to_string(),
-            cause: None,
+            cause: final_cause,
             context: Some(data),
             schema: None,
           },
@@ -691,8 +712,7 @@ impl Merger {
         );
         self
           .db
-          .execute(&sql, None)
-          .map_err(|e| format!("SPI Error in INSERT: {:?}", e))?;
+          .execute(&sql, None)?;
       } else if change_kind == "update" || change_kind == "delete" {
         entity_pairs.remove("id");
         entity_pairs.remove("type");
@@ -726,8 +746,7 @@ impl Merger {
         );
         self
           .db
-          .execute(&sql, None)
-          .map_err(|e| format!("SPI Error in UPDATE: {:?}", e))?;
+          .execute(&sql, None)?;
       }
     }
 
@@ -830,10 +849,7 @@ impl Merger {
         Self::quote_literal(&Value::String(user_id.to_string()))
       );
 
-      self
-        .db
-        .execute(&change_sql, None)
-        .map_err(|e| format!("Executor Error in change: {:?}", e))?;
+      self.db.execute(&change_sql, None)?;
     }
 
     if type_obj.notify {