fixup! [ADD] util.fields: handle ir.exports model/fields renames/removal

Author: aj-fuentes

src/util/fields.py

@@ -16,7 +16,7 @@
 
 import psycopg2
 from psycopg2 import sql
-from psycopg2.extras import Json, execute_values
+from psycopg2.extras import Json
 
 try:
     from odoo import release
@@ -142,63 +142,6 @@ def _get_resolved_ir_exports(cr, models=None, fields=None):
     return result
 
 
-def rename_ir_exports_fields(cr, models_fields_map):
-    """
-    Rename fields references in ir.exports.line records.
-
-    :param dict[str, dict[str, str]] models_fields_map: a dict of models to the fields rename dict,
-        like: `{"model.name": {"old_field": "new_field", ...}, ...}`
-
-    :meta private: exclude from online docs
-    """
-    matching_exports = _get_resolved_ir_exports(
-        cr,
-        fields=[(model, field) for model, fields_map in models_fields_map.items() for field in fields_map],
-    )
-    if not matching_exports:
-        return
-    _logger.debug("Renaming %d export template lines with renamed fields", len(matching_exports))
-    fixed_lines_paths = {}
-    for line_id, resolved_paths in matching_exports.items():
-        for path_part in resolved_paths:
-            assert path_part.field_model in models_fields_map
-            fields_map = models_fields_map[path_part.field_model]
-            assert path_part.field_name in fields_map
-            assert path_part.path[path_part.part_index - 1] == path_part.field_name
-            new_field_name = fields_map[path_part.field_name]
-            fixed_path = fixed_lines_paths.get(line_id, list(path_part.path))
-            fixed_path[path_part.part_index - 1] = new_field_name
-            fixed_lines_paths[line_id] = fixed_path
-    execute_values(
-        cr,
-        """
-        UPDATE ir_exports_line el
-           SET name = v.name
-          FROM (VALUES %s) AS v(id, name)
-         WHERE el.id = v.id
-        """,
-        [(k, "/".join(v)) for k, v in fixed_lines_paths.items()],
-    )
-
-
-def remove_ir_exports_lines(cr, models=None, fields=None):
-    """
-    Delete ir.exports.line records that reference models or fields that are/will be removed.
-
-    Only one of ``models`` or ``fields`` arguments should be provided.
-
-    :param list[str] models: a list of model names to match in exports
-    :param list[(str, str)] fields: a list of (model, field) tuples to match in exports
-
-    :meta private: exclude from online docs
-    """
-    matching_exports = _get_resolved_ir_exports(cr, models=models, fields=fields)
-    if not matching_exports:
-        return
-    _logger.debug("Deleting %d export template lines with removed models/fields", len(matching_exports))
-    cr.execute("DELETE FROM ir_exports_line WHERE id IN %s", [tuple(matching_exports.keys())])
-
-
 def ensure_m2o_func_field_data(cr, src_table, column, dst_table):
     """
     Fix broken m2o relations.
@@ -323,7 +266,9 @@ def clean_context(context):
         )
 
     # ir.exports.line
-    remove_ir_exports_lines(cr, fields=[(model, fieldname)])
+    matching_exports = _get_resolved_ir_exports(cr, fields=[(model, fieldname)])
+    if matching_exports:
+        cr.execute("DELETE FROM ir_exports_line WHERE id IN %s", [tuple(matching_exports.keys())])
 
     def adapter(leaf, is_or, negated):
         # replace by TRUE_LEAF, unless negated or in a OR operation but not negated
@@ -1195,7 +1140,31 @@ def _update_field_usage_multi(cr, models, old, new, domain_adapter=None, skip_in
 
         # ir.exports.line
         if only_models:
-            rename_ir_exports_fields(cr, {model: {old: new} for model in only_models})
+            cr.execute(
+                """
+                SELECT el.id,
+                       e.resource,
+                       STRING_TO_ARRAY(el.name, '/')
+                  FROM ir_exports_line el
+                  JOIN ir_exports e
+                    ON el.export_id = e.id
+                 WHERE el.name ~ %s
+                """,
+                [r"\y{}\y".format(old)],
+            )
+            fixed_lines_paths = {}
+            for line_id, model, path in cr.fetchall():
+                new_path = [
+                    new if x.field_name == old and x.field_model in only_models else x.field_name
+                    for x in resolve_model_fields_path(cr, model, path)
+                ]
+                if len(new_path) == len(path) and new_path != path:
+                    fixed_lines_paths[line_id] = "/".join(new_path)
+            if fixed_lines_paths:
+                cr.execute(
+                    "UPDATE ir_exports_line SET name = (%s::jsonb)->>(id::text) WHERE id IN %s",
+                    [Json(fixed_lines_paths), tuple(fixed_lines_paths)],
+                )
 
         # mail.alias
         if column_exists(cr, "mail_alias", "alias_defaults"):

src/util/models.py

@@ -10,8 +10,8 @@
 import re
 
 from .const import ENVIRON
-from .fields import IMD_FIELD_PATTERN, remove_field, remove_ir_exports_lines
-from .helpers import _ir_values_value, _validate_model, model_of_table, table_of_model
+from .fields import IMD_FIELD_PATTERN, remove_field
+from .helpers import _ir_values_value, _validate_model, model_of_table, resolve_model_fields_path, table_of_model
 from .indirect_references import indirect_references
 from .inherit import for_each_inherit, inherit_parents
 from .misc import _cached, chunks, log_progress
@@ -130,7 +130,23 @@ def remove_model(cr, model, drop_table=True, ignore_m2m=()):
                 notify = notify or bool(cr.rowcount)
 
     # for ir.exports.line we have to take care of "nested" references in fields "paths"
-    remove_ir_exports_lines(cr, models=[model])
+    cr.execute(
+        """
+        SELECT el.id,
+               e.resource AS model,
+               string_to_array(el.name, '/') AS path
+          FROM ir_exports e
+          JOIN ir_exports_line el
+            ON e.id = el.export_id
+        """,
+    )
+    to_rem = [
+        line_id
+        for line_id, line_model, line_path in cr.fetchall()
+        if any(x.field_model == model for x in resolve_model_fields_path(cr, line_model, line_path))
+    ]
+    if to_rem:
+        cr.execute("DELETE FROM ir_exports_line WHERE id IN %s", [tuple(to_rem)])
 
     _rm_refs(cr, model)