Merge branch 'master' of https://github.com/collerek/ormar into inheritance_1

docs/releases.md

@@ -1,3 +1,7 @@
+# 0.7.2
+
+* Fix for overwriting related models with pk only in `Model.update() with fields passed as parameters` (fix [#70][#70])
+
 # 0.7.1
 
 * Fix for overwriting related models with pk only in `Model.save()` (fix [#68][#68])
@@ -183,4 +187,5 @@ Add queryset level methods
 
 [#19]: https://github.com/collerek/ormar/issues/19
 [#60]: https://github.com/collerek/ormar/issues/60
-[#68]: https://github.com/collerek/ormar/issues/68
+[#68]: https://github.com/collerek/ormar/issues/68
+[#70]: https://github.com/collerek/ormar/issues/70

ormar/__init__.py

@@ -44,7 +44,7 @@ class UndefinedType:  # pragma no cover
 
 Undefined = UndefinedType()
 
-__version__ = "0.7.1"
+__version__ = "0.7.2"
 __all__ = [
     "Integer",
     "BigInteger",

ormar/models/model.py

@@ -269,8 +269,7 @@ class Model(NewBaseModel):
 
     async def update(self: T, **kwargs: Any) -> T:
         if kwargs:
-            new_values = {**self.dict(), **kwargs}
-            self.from_dict(new_values)
+            self.from_dict(kwargs)
 
         if not self.pk:
             raise ModelPersistenceError(

tests/test_saving_nullable_fields.py

@@ -0,0 +1,66 @@
+from typing import Optional
+
+import databases
+import sqlalchemy
+from sqlalchemy import create_engine
+
+import ormar
+import pytest
+
+from tests.settings import DATABASE_URL
+
+db = databases.Database(DATABASE_URL, force_rollback=True)
+metadata = sqlalchemy.MetaData()
+
+
+class PrimaryModel(ormar.Model):
+    class Meta:
+        metadata = metadata
+        database = db
+        tablename = "primary_models"
+
+    id: int = ormar.Integer(primary_key=True)
+    name: str = ormar.String(max_length=255, index=True)
+    some_text: str = ormar.Text()
+    # NOTE: Removing nullable=True makes the test pass.
+    some_other_text: Optional[str] = ormar.Text(nullable=True)
+
+
+class SecondaryModel(ormar.Model):
+    class Meta:
+        metadata = metadata
+        database = db
+        tablename = "secondary_models"
+
+    id: int = ormar.Integer(primary_key=True)
+    name: str = ormar.String(max_length=100)
+    primary_model: PrimaryModel = ormar.ForeignKey(
+        PrimaryModel, related_name="secondary_models",
+    )
+
+
+@pytest.fixture(autouse=True, scope="module")
+def create_test_database():
+    engine = create_engine(DATABASE_URL)
+    metadata.create_all(engine)
+    yield
+    metadata.drop_all(engine)
+
+
+@pytest.mark.asyncio
+async def test_create_models():
+    async with db:
+        async with db.transaction(force_rollback=True):
+            primary = await PrimaryModel(
+                name="Foo", some_text="Bar", some_other_text="Baz"
+            ).save()
+            assert primary.id == 1
+
+            secondary = await SecondaryModel(name="Foo", primary_model=primary).save()
+            assert secondary.id == 1
+            assert secondary.primary_model.id == 1
+
+            secondary = await SecondaryModel.objects.get()
+            assert secondary.name == "Foo"
+            await secondary.update(name="Updated")
+            assert secondary.name == "Updated"