altcodepro-polydb-python 2.5.1__tar.gz → 2.5.2__tar.gz

{altcodepro_polydb_python-2.5.1/src/altcodepro_polydb_python.egg-info → altcodepro_polydb_python-2.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: altcodepro-polydb-python
-Version: 2.5.1
+Version: 2.5.2
 Summary: Production-ready multi-cloud database abstraction layer with connection pooling, retry logic, and thread safety
 Author: AltCodePro
 Project-URL: Homepage, https://github.com/altcodepro/polydb-python

{altcodepro_polydb_python-2.5.1 → altcodepro_polydb_python-2.5.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "altcodepro-polydb-python"
-version = "2.5.1"
+version = "2.5.2"
 description = "Production-ready multi-cloud database abstraction layer with connection pooling, retry logic, and thread safety"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.11"

{altcodepro_polydb_python-2.5.1 → altcodepro_polydb_python-2.5.2/src/altcodepro_polydb_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: altcodepro-polydb-python
-Version: 2.5.1
+Version: 2.5.2
 Summary: Production-ready multi-cloud database abstraction layer with connection pooling, retry logic, and thread safety
 Author: AltCodePro
 Project-URL: Homepage, https://github.com/altcodepro/polydb-python

{altcodepro_polydb_python-2.5.1 → altcodepro_polydb_python-2.5.2}/src/polydb/adapters/MongoDBAdapter.py

@@ -134,6 +134,34 @@ class MongoDBAdapter(NoSQLKVAdapter):
             finally:
                 self._indexed_collections.add(collection_name)
 
+    # -----------------------------------------------------
+    # Internal <-> domain field mapping
+    # -----------------------------------------------------
+
+    def _finalize_doc(self, model: type, doc: JsonDict) -> JsonDict:
+        """
+        Strip PolyDB's internal _pk/_rk storage keys before returning a
+        record, mapping each back to the domain field it was derived from
+        (the model's declared partition_key/sort_key) -- mirrors
+        AzureTableStorageAdapter._unpack_entity, which already does this
+        for PartitionKey/RowKey. Without it, callers see raw storage-
+        internal column names instead of their own schema's field names.
+        Guarded with setdefault so a real stored property never gets
+        clobbered by the derived value.
+        """
+        pk_field, rk_field = self._pk_rk_field_names(model)
+        pk_val = doc.pop("_pk", None)
+        rk_val = doc.pop("_rk", None)
+
+        if pk_val is not None:
+            doc.setdefault(pk_field, pk_val)
+        if rk_val is not None:
+            doc.setdefault(rk_field, rk_val)
+
+        doc.setdefault("id", rk_val)
+
+        return doc
+
     # -----------------------------------------------------
     # PUT
     # -----------------------------------------------------
@@ -158,11 +186,7 @@ class MongoDBAdapter(NoSQLKVAdapter):
             )
 
             # return full stored row (tests expect this)
-            result = dict(payload)
-            result.pop("_pk", None)
-            result.pop("_rk", None)
-
-            return result
+            return self._finalize_doc(model, dict(payload))
 
         except Exception as e:
             raise NoSQLError(f"MongoDB put failed: {e}")
@@ -182,9 +206,8 @@ class MongoDBAdapter(NoSQLKVAdapter):
                 return None
 
             doc.pop("_id", None)
-            doc.setdefault("id", rk)
 
-            return doc
+            return self._finalize_doc(model, doc)
 
         except Exception as e:
             raise NoSQLError(f"MongoDB get failed: {e}")
@@ -215,8 +238,7 @@ class MongoDBAdapter(NoSQLKVAdapter):
 
             for doc in cursor:
                 doc.pop("_id", None)
-                doc.setdefault("id", doc.get("_rk"))
-                rows.append(doc)
+                rows.append(self._finalize_doc(model, doc))
 
             if not rows:
                 return [], None
@@ -283,8 +305,7 @@ class MongoDBAdapter(NoSQLKVAdapter):
 
             for doc in cursor:
                 doc.pop("_id", None)
-                doc.setdefault("id", doc.get("_rk"))
-                results.append(doc)
+                results.append(self._finalize_doc(model, doc))
 
             return results