maybe working

src/database/executors/pgrx.rs

@@ -79,9 +79,9 @@ impl DatabaseExecutor for SpiExecutor {
       }
     }
 
+    pgrx::debug1!("JSPG_SQL: {}", sql);
     self.transact(|| {
       Spi::connect(|client| {
-        pgrx::notice!("JSPG_SQL: {}", sql);
         match client.select(sql, Some(args_with_oid.len() as i64), &args_with_oid) {
           Ok(tup_table) => {
             let mut results = Vec::new();
@@ -110,9 +110,9 @@ impl DatabaseExecutor for SpiExecutor {
       }
     }
 
+    pgrx::debug1!("JSPG_SQL: {}", sql);
     self.transact(|| {
       Spi::connect_mut(|client| {
-        pgrx::notice!("JSPG_SQL: {}", sql);
         match client.update(sql, Some(args_with_oid.len() as i64), &args_with_oid) {
           Ok(_) => Ok(()),
           Err(e) => Err(format!("SPI Execution Failure: {}", e)),

src/database/schema.rs

@@ -508,7 +508,7 @@ impl Schema {
     if let Some(family) = &self.obj.family {
       parent_type_name = Some(family.split('.').next_back().unwrap_or(family).to_string());
     } else if let Some(identifier) = self.obj.identifier() {
-      parent_type_name = Some(identifier);
+      parent_type_name = Some(identifier.split('.').next_back().unwrap_or(&identifier).to_string());
     }
 
     if let Some(p_type) = parent_type_name {
@@ -530,11 +530,11 @@ impl Schema {
           if let Some(family) = &target_schema.obj.family {
             child_type_name = Some(family.split('.').next_back().unwrap_or(family).to_string());
           } else if let Some(ref_id) = target_schema.obj.identifier() {
-            child_type_name = Some(ref_id);
+            child_type_name = Some(ref_id.split('.').next_back().unwrap_or(&ref_id).to_string());
           } else if let Some(arr) = &target_schema.obj.one_of {
             if let Some(first) = arr.first() {
               if let Some(ref_id) = first.obj.identifier() {
-                child_type_name = Some(ref_id);
+                child_type_name = Some(ref_id.split('.').next_back().unwrap_or(&ref_id).to_string());
               }
             }
           }
@@ -622,8 +622,43 @@ pub(crate) fn resolve_relation<'a>(
     }
   }
 
+  if !resolved && relative_keys.is_some() {
+    // 1. M:M Disambiguation: The child schema explicitly defines an outbound property
+    // matching one of the relational prefixes (e.g. "target"). We first identify that consumed relation.
+    let keys = relative_keys.unwrap();
+    let mut consumed_rel_idx = None;
+    for (i, rel) in matching_rels.iter().enumerate() {
+      if let Some(prefix) = &rel.prefix {
+        if keys.contains(prefix) {
+          consumed_rel_idx = Some(i);
+          break; // Found the routing edge explicitly consumed by the schema payload
+        }
+      }
+    }
+
+    // Then, we find its exact Twin on the same junction boundary that provides the reverse ownership.
+    if let Some(used_idx) = consumed_rel_idx {
+      let used_rel = matching_rels[used_idx];
+      let mut twin_ids = Vec::new();
+      for (i, rel) in matching_rels.iter().enumerate() {
+        if i != used_idx
+          && rel.source_type == used_rel.source_type
+          && rel.destination_type == used_rel.destination_type
+          && rel.prefix.is_some()
+        {
+          twin_ids.push(i);
+        }
+      }
+
+      if twin_ids.len() == 1 {
+        chosen_idx = twin_ids[0];
+        resolved = true;
+      }
+    }
+  }
+
   if !resolved {
-    // 1. If there's EXACTLY ONE relation with a null prefix, it's the base structural edge. Pick it.
+    // 2. Base 1:M Fallback. If there's EXACTLY ONE relation with a null prefix, it's the base structural edge.
     let mut null_prefix_ids = Vec::new();
     for (i, rel) in matching_rels.iter().enumerate() {
       if rel.prefix.is_none() {
@@ -632,24 +667,6 @@ pub(crate) fn resolve_relation<'a>(
     }
     if null_prefix_ids.len() == 1 {
       chosen_idx = null_prefix_ids[0];
-      resolved = true;
-    }
-  }
-
-  if !resolved && relative_keys.is_some() {
-    // 2. M:M Disambiguation: The child schema will explicitly define an outbound property
-    // matching one of the relational prefixes (e.g. "target"). We use the OTHER one (e.g. "source").
-    let keys = relative_keys.unwrap();
-    let mut missing_prefix_ids = Vec::new();
-    for (i, rel) in matching_rels.iter().enumerate() {
-      if let Some(prefix) = &rel.prefix {
-        if !keys.contains(prefix) {
-          missing_prefix_ids.push(i);
-        }
-      }
-    }
-    if missing_prefix_ids.len() == 1 {
-      chosen_idx = missing_prefix_ids[0];
       // resolved = true;
     }
   }

src/merger/mod.rs

@@ -192,7 +192,7 @@ impl Merger {
     let mut entity_objects = std::collections::BTreeMap::new();
     let mut entity_arrays = std::collections::BTreeMap::new();
 
-    for (k, v) in obj.clone() {
+    for (k, v) in obj {
       // Always retain system and unmapped core fields natively implicitly mapped to the Postgres tables
       if k == "id" || k == "type" || k == "created" {
         entity_fields.insert(k.clone(), v.clone());
@@ -333,20 +333,6 @@ impl Merger {
       entity_replaces = replaces;
     }
 
-    #[cfg(not(test))]
-    if type_name == "contact" || type_name == "person" {
-      pgrx::notice!("=== DEBUG {} PAYLOAD ===", type_name);
-      pgrx::notice!("1. Incoming obj iteration: {:?}", obj);
-      pgrx::notice!("2. Final mapped entity_fields: {:?}", entity_fields);
-      pgrx::notice!(
-        "3. TypeDef fields check: {:?}",
-        type_def.fields.contains(&"source_id".to_string())
-      );
-      if !entity_fields.contains_key("source_id") {
-        pgrx::notice!("CRITICAL ERROR: source_id was dropped during mapping loop!");
-      }
-    }
-
     self.merge_entity_fields(
       entity_change_kind.as_deref().unwrap_or(""),
       &type_name,