Merge pull request #44 from octabytes/feature

fix update field with default value issue #43

Author: AxeemHaider

setup.py

@@ -16,7 +16,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.2.2',
+    version='1.2.3',
 
     description="FireO ORM is specifically designed for the Google's Firestore",
     long_description=long_description,

src/fireo/fields/base_field.py

@@ -96,7 +96,7 @@ def db_column_name(self):
         """
         return self.raw_attributes.get("column_name") or self.name
 
-    def get_value(self, val, ignore_required=False):
+    def get_value(self, val, ignore_required=False, ignore_default=False):
         """Get field value after validation
 
         Make validation and applying attribute function on it.
@@ -110,11 +110,14 @@ def get_value(self, val, ignore_required=False):
         ignore_required : Bool
             Ignore required fields or not mostly ignore when updating the document
 
+        ignore_default : Bool
+            Ignore default fields or not mostly ignore when updating the document
+
         Returns
         -------
             DB value
         """
-        v = self.field_attribute.parse(val, ignore_required)
+        v = self.field_attribute.parse(val, ignore_required, ignore_default)
         return self.db_value(v)
 
     def db_value(self, val):

src/fireo/fields/field_attribute.py

@@ -60,7 +60,7 @@ def __init__(self, field, attributes):
         self.attributes = attributes or {}
 
     # validate each field and it's attributes
-    def parse(self, value, ignore_required=False, run_only=None):
+    def parse(self, value, ignore_required=False, ignore_default=False, run_only=None):
         """validate the value and perform action according to attribute"""
         for attr in self.attributes:
             if attr not in self.field.allowed_attributes + FieldAttribute.allowed_attributes:
@@ -75,7 +75,7 @@ def parse(self, value, ignore_required=False, run_only=None):
                 return value
 
             # check default value if set for field
-            if self.default is not None and value is None:
+            if self.default is not None and value is None and not ignore_default:
                 value = self.default
 
             # check this field is required or not

src/fireo/queries/update_query.py

@@ -54,7 +54,7 @@ class User(Model):
                 # Get nested model field
                 self._nested_field_list(f, field_dict, f.name)
             else:
-                v = f.get_value(self.query.get(f.name), ignore_required=True)
+                v = f.get_value(self.query.get(f.name), ignore_required=True, ignore_default=True)
                 if v or type(v) is bool:
                     field_dict[f.db_column_name] = v
         return field_dict
@@ -79,8 +79,10 @@ def _raw_exec(self, transaction_or_batch=None):
         if transaction_or_batch:
             transaction_or_batch.update(ref, self._parse_field())
             return None
-        ref.update(self._parse_field())
-        return ref.get()
+
+        if self._parse_field():
+            ref.update(self._parse_field())
+            return ref.get()
 
     def exec(self, transaction_or_batch=None):
         """return modified instance of model"""

src/tests/v12/test_fix_update_field_with_default.py

@@ -0,0 +1,22 @@
+from fireo.fields import NumberField
+from fireo.models import Model
+
+
+def test_update_fields_with_default_values():
+    class UpdateModelWithDefault(Model):
+        amount = NumberField(default=15)
+
+
+    m = UpdateModelWithDefault(amount=11)
+    m.save()
+
+    assert m.amount == 11
+
+    m.update()
+
+    assert m.amount == 11
+
+    m.amount = 13
+    m.update()
+
+    assert m.amount == 13