#435 Fix instance creation state check

AUTHORS.rst

@@ -49,6 +49,7 @@
 | Lucas Wiman <[email protected]>
 | Martey Dodoo <[email protected]>
 | Matthew Schinckel <[email protected]>
+| Maxim Zemskov <[email protected]>
 | Michael van Tellingen <[email protected]>
 | Mike Bryant <[email protected]>
 | Mikhail Silonov <[email protected]>

CHANGES.rst

@@ -10,6 +10,7 @@ CHANGES
 - `FieldTracker` now respects `update_fields` changed in overridden `save()`
   method
 - Replace ugettext_lazy with gettext_lazy to satisfy Django deprecation warning
+- `FieldTracker` now works correct with instance where PK field is not `AutoField` (e.g. `UUIDField`)
 
 4.0.0 (2019-12-11)
 ------------------

model_utils/tracker.py

@@ -101,7 +101,7 @@ def get_field_value(self, field):
         return getattr(self.instance, self.field_map[field])
 
     def set_saved_fields(self, fields=None):
-        if not self.instance.pk:
+        if self.instance._state.adding:
             self.saved_data = {}
         elif fields is None:
             self.saved_data = self.current()
@@ -140,7 +140,7 @@ def previous(self, field):
         """Returns currently saved value of given field"""
 
         # handle deferred fields that have not yet been loaded from the database
-        if self.instance.pk and field in self.deferred_fields and field not in self.saved_data:
+        if not self.instance._state.adding and field in self.deferred_fields and field not in self.saved_data:
 
             # if the field has not been assigned locally, simply fetch and un-defer the value
             if field not in self.instance.__dict__:
@@ -271,7 +271,7 @@ class ModelInstanceTracker(FieldInstanceTracker):
 
     def has_changed(self, field):
         """Returns ``True`` if field has changed from currently saved value"""
-        if not self.instance.pk:
+        if self.instance._state.adding:
             return True
         elif field in self.saved_data:
             return self.previous(field) != self.get_field_value(field)
@@ -280,7 +280,7 @@ def has_changed(self, field):
 
     def changed(self):
         """Returns dict of fields that changed since save (with old values)"""
-        if not self.instance.pk:
+        if self.instance._state.adding:
             return {}
         saved = self.saved_data.items()
         current = self.current()

tests/test_fields/test_field_tracker.py

@@ -790,7 +790,7 @@ class ModelTrackerForeignKeyTests(FieldTrackerForeignKeyTests):
     tracked_class = ModelTrackedFK
 
     def test_custom_without_id(self):
-        with self.assertNumQueries(2):
+        with self.assertNumQueries(1):
             self.tracked_class.objects.get()
         self.tracker = self.instance.custom_tracker_without_id
         self.assertChanged()