diff --git a/README.md b/README.md index a7f4aad..63d2df4 100644 --- a/README.md +++ b/README.md @@ -164,7 +164,7 @@ modules.csv autogenerated. At this step, you should change the autogenerated files. For exemple: -- you can set ``skip_update=True`` to prevents to run an update=all, in the 'regular' steps +- you can set ``update=False`` to prevents to run an update=all, in the 'regular' steps (first and last steps). In that case, only SQL queries and python scripts will be executed during this step. diff --git a/newsfragments/+add-option-no-update-all.feature b/newsfragments/+add-option-no-update-all.feature index f3c0690..3e1ea61 100644 --- a/newsfragments/+add-option-no-update-all.feature +++ b/newsfragments/+add-option-no-update-all.feature @@ -1,4 +1,4 @@ -Add an option ``skip_update`` in the configuration file at migration_step level. -If enabled, the update=all step will be skipped during this step. +Add an option ``update`` in the configuration file at migration_step level. +If disabled, the update=all step will be skipped during this step. That can be interesting to save time, during the first and the last steps of the migration process (when ``execution_context='regular'). diff --git a/odoo_openupgrade_wizard/cli/cli_upgrade.py b/odoo_openupgrade_wizard/cli/cli_upgrade.py index b49742c..a7e06c0 100644 --- a/odoo_openupgrade_wizard/cli/cli_upgrade.py +++ b/odoo_openupgrade_wizard/cli/cli_upgrade.py @@ -30,7 +30,7 @@ def upgrade(ctx, first_step, last_step, database, with_demo): ) for migration_step in migration_steps: execute_sql_files_pre_migration(ctx, database, migration_step) - if not migration_step.get("skip_update", False): + if migration_step.get("update", True): try: run_odoo( ctx, @@ -46,13 +46,14 @@ def upgrade(ctx, first_step, last_step, database, with_demo): finally: kill_odoo(ctx, database, migration_step) elif migration_step.get("execution_context") == "openupgrade": - logger.warning( - "Incorrect setting skip_update = True" - " and execution_context = 'openupgrade'..." + raise ValueError( + "Incorrect setting 'update: True'" + " and 'execution_context: openupgrade'" ) else: logger.info( - f"Skip update all for version {migration_step.get('version')}." + "Skip update=all for" + f" step {migration_step.get('complete_name')}" ) execute_click_odoo_python_files(ctx, database, migration_step) diff --git a/odoo_openupgrade_wizard/templates/config.yml.j2 b/odoo_openupgrade_wizard/templates/config.yml.j2 index d9cc8d6..5b0caab 100644 --- a/odoo_openupgrade_wizard/templates/config.yml.j2 +++ b/odoo_openupgrade_wizard/templates/config.yml.j2 @@ -32,7 +32,7 @@ migration_steps: execution_context: {{ step['execution_context'] }} complete_name: {{ step['complete_name'] }} {%- if step['execution_context'] == 'regular'%} - skip_update: False + update: True {%- endif %} {% endfor %} diff --git a/tests/data/output_expected/config.yml b/tests/data/output_expected/config.yml index c64bc57..af81604 100644 --- a/tests/data/output_expected/config.yml +++ b/tests/data/output_expected/config.yml @@ -28,7 +28,7 @@ migration_steps: version: 14.0 execution_context: regular complete_name: step_01__regular__14.0 - skip_update: False + update: True - name: 2 version: 15.0 @@ -39,7 +39,7 @@ migration_steps: version: 15.0 execution_context: regular complete_name: step_03__regular__15.0 - skip_update: False + update: True workload_settings: