[FIX] util/fields: update usage before changing ir_model_fields

`update_field_usage` does multiple operations, e.g. adapt domains, that
depend on correctly identifying the model of a field via
`ir_model_fields`. If the rename in `ir_model_fields` is done before
updating the usage of a field the latter cannot be done correctly.

closes #97

Signed-off-by: Christophe Simonis (chs) <[email protected]>

Author: aj-fuentes

src/base/tests/test_util.py

@@ -1,3 +1,4 @@
+import ast
 import operator
 import re
 import threading
@@ -27,6 +28,20 @@ def setUp(self):
         super(TestAdaptOneDomain, self).setUp()
         self.mock_adapter = mock.Mock()
 
+    def test_adapt_renamed_field(self):
+        domain = [("user_ids.partner_id.user_ids.partner_id", "=", False)]
+        Filter = self.env["ir.filters"]
+        filter1 = Filter.create(
+            {"name": "Test filter for adapt domain", "model_id": "res.partner", "domain": str(domain)}
+        )
+        assert domain == ast.literal_eval(filter1.domain)
+        util.invalidate(Filter)
+        util.rename_field(self.cr, "res.partner", "user_ids", "renamed_user_ids")
+        match_domain = [("renamed_user_ids.partner_id.renamed_user_ids.partner_id", "=", False)]
+        new_domain = ast.literal_eval(filter1.domain)
+
+        self.assertEqual(match_domain, new_domain)
+
     def test_change_no_leaf(self):
         # testing plan: updata path of a domain where the last element is not changed
 

src/util/fields.py

@@ -457,6 +457,10 @@ def rename_field(cr, model, old, new, update_references=True, domain_adapter=Non
     rf = ENVIRON["__renamed_fields"][model]
     rf[new] = rf.pop(old, old)
 
+    if update_references:
+        # skip all inherit, they will be handled by the resursive call
+        update_field_usage(cr, model, old, new, domain_adapter=domain_adapter, skip_inherit="*")
+
     try:
         with savepoint(cr):
             cr.execute("UPDATE ir_model_fields SET name=%s WHERE model=%s AND name=%s RETURNING id", (new, model, old))
@@ -568,10 +572,6 @@ def rename_field(cr, model, old, new, update_references=True, domain_adapter=Non
         old_index_name = make_index_name(table, old)
         cr.execute('ALTER INDEX IF EXISTS "{0}" RENAME TO "{1}"'.format(new_index_name, old_index_name))
 
-    if update_references:
-        # skip all inherit, they will be handled by the resursive call
-        update_field_usage(cr, model, old, new, domain_adapter=domain_adapter, skip_inherit="*")
-
     # rename field on inherits
     for inh in for_each_inherit(cr, model, skip_inherit):
         rename_field(cr, inh.model, old, new, update_references=update_references, skip_inherit=skip_inherit)