fixup! wip: simplify upgrade

Author: yankinmax

fs_storage/__manifest__.py

@@ -17,6 +17,6 @@
         "security/ir.model.access.csv",
         "wizards/fs_test_connection.xml",
     ],
-    "external_dependencies": {"python": ["fsspec>=2024.5.0"]},
+    "external_dependencies": {"python": ["fsspec>=2024.5.0", "openupgradelib>=3.6.0"]},
     "installable": True,
 }

fs_storage/migrations/19.0.1.1.2/post-migration.py

@@ -1,12 +1,8 @@
 # Copyright 2026 Camptocamp SA
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
 
-import logging
-
 from openupgradelib import openupgrade
 
-_logger = logging.getLogger(__name__)
-
 
 @openupgrade.migrate()
 def migrate(env, version):
@@ -19,6 +15,5 @@ def migrate(env, version):
         limit=1,
     )
     if not module:
-        _logger.info("Module fs_storage_environment not found")
         return
     module.button_install()

fs_storage/migrations/19.0.1.1.2/pre-migration.py

@@ -9,69 +9,86 @@
 
 
 def _get_server_env_mixin_fnames(cr, model: str) -> set[str]:
+    """Return the core mixin field names present on the model."""
     possible_fnames = ("server_env_defaults", "tech_name")
     cr.execute(
         SQL(
             """
             SELECT name
             FROM ir_model_fields
             WHERE model = %(model)s
-            AND name IN %(possible_fnames)s
+              AND name IN %(possible_fnames)s
             """,
             model=model,
             possible_fnames=possible_fnames,
         )
     )
-    return set(row[0] for row in cr.fetchall())
+    return {row[0] for row in cr.fetchall()}
 
 
-def _get_server_env_mixin_magic_fnames(cr, model: str) -> set[str]:
-    """Find all the magic server environment field names for a given model"""
-    # Get all fields created on-the-fly by the mixin. Following the name patterns:
-    # - default fields: x_<field_name>_env_default
-    # - is editable fields: x_<field_name>_env_is_editable
+def _get_server_env_mixin_magic_fnames(cr, model):
+    """Return the dynamic server_environment helper fields for the model.
+
+    These are the fields created on the fly by server.env.mixin:
+    - x_<field_name>_env_default
+    - x_<field_name>_env_is_editable
+    """
     cr.execute(
         SQL(
             """
             SELECT name
             FROM ir_model_fields
             WHERE model = %(model)s
-            AND name LIKE 'x_%%_env_default'
-            OR name LIKE 'x_%%_env_is_editable'
+              AND (
+                    name LIKE 'x_%%_env_default'
+                 OR name LIKE 'x_%%_env_is_editable'
+              )
             """,
             model=model,
         )
     )
-    return set(row[0] for row in cr.fetchall())
+    return {row[0] for row in cr.fetchall()}
+
 
+@openupgrade.migrate()
+def migrate(env, version):
+    """Move XMLIDs to the glue module.
 
-def migrate(cr, version):
+    This keeps the server_environment ir.model.fields metadata attached to the
+    new module and preserves field values.
+    """
+    cr = env.cr
     if not version:
         return
+
     model = "fs.storage"
+    old_module = "fs_storage"
+    new_module = "fs_storage_environment"
+
     mixin_fnames = _get_server_env_mixin_fnames(cr, model)
     magic_fnames = _get_server_env_mixin_magic_fnames(cr, model)
     to_move_fnames = mixin_fnames | magic_fnames
-    old_module = "fs_storage"
-    new_module = "fs_storage_environment"
+
     rename_specs = [
         (field_xmlid(old_module, model, fname), field_xmlid(new_module, model, fname))
         for fname in to_move_fnames
     ]
     openupgrade.rename_xmlids(cr, rename_specs, allow_merge=True)
+
     # Add noupdate to the magic_fnames, to prevent Odoo from deleting them in upgrade
-    openupgrade.logged_query(
-        cr,
-        """
-        UPDATE ir_model_data SET noupdate = TRUE
-        WHERE module = %(module)s
-        AND name IN %(names)s
-        """,
-        dict(
-            module=new_module,
-            names=tuple(
-                field_xmlid(new_module, model, fname).split(".")[1]
-                for fname in magic_fnames
+    if magic_fnames:
+        openupgrade.logged_query(
+            cr,
+            """
+            UPDATE ir_model_data SET noupdate = TRUE
+            WHERE module = %(module)s
+            AND name IN %(names)s
+            """,
+            dict(
+                module=new_module,
+                names=tuple(
+                    field_xmlid(new_module, model, fname).split(".")[1]
+                    for fname in magic_fnames
+                ),
             ),
-        ),
-    )
+        )

requirements.txt

@@ -2,4 +2,5 @@
 fsspec>=2024.5.0
 fsspec>=2025.3.0
 fsspec[s3]
+openupgradelib>=3.6.0
 python_slugify