matrx-orm 3.0.7__tar.gz → 3.0.10__tar.gz

{matrx_orm-3.0.7 → matrx_orm-3.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: matrx-orm
-Version: 3.0.7
+Version: 3.0.10
 Summary: Async-first PostgreSQL ORM with bidirectional migrations, schema introspection, many-to-many relationships, and built-in state caching. Works with any PostgreSQL database.
 Project-URL: Homepage, https://github.com/armanisadeghi/matrx-orm
 Project-URL: Repository, https://github.com/armanisadeghi/matrx-orm
@@ -1836,6 +1836,7 @@ When you run the schema builder against a database that has `vector(n)` columns,
 
 | Version | Highlights |
 |---|---|
+| **v3.0.10** | Patch release |
 | **v3.0.1** | Patch release |
 | **v3.0.0** | Major release |
 | **v2.0.35** | Patch release |

{matrx_orm-3.0.7 → matrx_orm-3.0.10}/README.md

@@ -1795,6 +1795,7 @@ When you run the schema builder against a database that has `vector(n)` columns,
 
 | Version | Highlights |
 |---|---|
+| **v3.0.10** | Patch release |
 | **v3.0.1** | Patch release |
 | **v3.0.0** | Major release |
 | **v2.0.35** | Patch release |

{matrx_orm-3.0.7 → matrx_orm-3.0.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "matrx-orm"
-version = "3.0.7"
+version = "3.0.10"
 description = "Async-first PostgreSQL ORM with bidirectional migrations, schema introspection, many-to-many relationships, and built-in state caching. Works with any PostgreSQL database."
 readme = "README.md"
 license = { text = "MIT" }

{matrx_orm-3.0.7 → matrx_orm-3.0.10}/src/matrx_orm/core/fields.py

@@ -560,13 +560,19 @@ class JSONField(Field, Generic[_JT]):
 
     def to_python(self, value):
         if isinstance(value, str):
+            if not value.strip():
+                return None
             return json.loads(value)
         return value
 
     def get_db_prep_value(self, value):
-        if value is not None and not isinstance(value, str):
-            return json.dumps(value)
-        return value
+        if value is None:
+            return None
+        if isinstance(value, str):
+            if not value.strip():
+                return None
+            return value
+        return json.dumps(value)
 
 
 class ArrayField(Field):
@@ -1027,10 +1033,16 @@ class JSONBField(Field, Generic[_JT]):
                     break
         if name is None:
             return  # Cannot determine attribute name; bail rather than corrupt state.
-        if isinstance(value, Field):
-            object.__setattr__(obj, name, None)
-            return
-        object.__setattr__(obj, name, self.to_python(value))
+        coerced = None if isinstance(value, Field) else self.to_python(value)
+        # Model uses RuntimeMixin which routes all attribute writes through
+        # self._data.  We must write there to avoid triggering this __set__
+        # again via object.__setattr__ (which re-invokes the data descriptor).
+        _data = obj.__dict__.get("_data")
+        if _data is not None:
+            _data[name] = coerced
+        else:
+            # Fallback for non-Model objects or before _data is initialised.
+            obj.__dict__[name] = coerced
 
     def to_python(self, value: Any) -> _JT | None:
         """Deserialise to a Python object.
@@ -1047,6 +1059,8 @@ class JSONBField(Field, Generic[_JT]):
         if isinstance(value, Field):
             return None  # type: ignore[return-value]
         if isinstance(value, str):
+            if not value.strip():
+                return None
             value = json.loads(value)
         if self._pydantic_schema is not None and isinstance(value, dict):
             return self._pydantic_schema.model_validate(value)  # type: ignore[return-value]
@@ -1083,6 +1097,8 @@ class JSONBField(Field, Generic[_JT]):
         if isinstance(value, str):
             # Re-validate: parse then re-encode so callers can't inject
             # malformed JSON strings directly into the wire value.
+            if not value.strip():
+                return None
             return json.dumps(json.loads(value))
         return json.dumps(value)
 

{matrx_orm-3.0.7 → matrx_orm-3.0.10}/tests/level1/test_fields.py

@@ -364,6 +364,14 @@ class TestJSONField:
     def test_get_db_prep_value_none(self):
         assert JSONField().get_db_prep_value(None) is None
 
+    def test_to_python_empty_string_returns_none(self):
+        assert JSONField().to_python("") is None
+        assert JSONField().to_python("   ") is None
+
+    def test_get_db_prep_value_empty_string_returns_none(self):
+        assert JSONField().get_db_prep_value("") is None
+        assert JSONField().get_db_prep_value("   ") is None
+
 
 # ---------------------------------------------------------------------------
 # ArrayField

{matrx_orm-3.0.7 → matrx_orm-3.0.10}/uv.lock

@@ -667,7 +667,7 @@ wheels = [
 
 [[package]]
 name = "matrx-orm"
-version = "3.0.0"
+version = "3.0.9"
 source = { editable = "." }
 dependencies = [
     { name = "asyncpg" },