From 307c84f710e04b03d8681f47473140a2e29b5de1 Mon Sep 17 00:00:00 2001 From: cubells Date: Mon, 21 Aug 2017 13:28:20 +0200 Subject: [PATCH 1/4] [IMP] queue_job: OpenUpgrade migration script from 9.0 --- .../migrations/10.0.1.0.0/pre-migration.py | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 queue_job/migrations/10.0.1.0.0/pre-migration.py diff --git a/queue_job/migrations/10.0.1.0.0/pre-migration.py b/queue_job/migrations/10.0.1.0.0/pre-migration.py new file mode 100644 index 0000000000..50d5020f8d --- /dev/null +++ b/queue_job/migrations/10.0.1.0.0/pre-migration.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Tecnativa - Vicent Cubells +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + + +def migrate(cr, version): + if not version: + return + # In order to migrate connector from v. 9.0 to v. 10.0, we need to set + # connector module state to 'to upgrade' + cr.execute(""" + UPDATE ir_module_module + SET state='to upgrade' + WHERE name='connector' + """) + from openupgradelib import openupgrade + openupgrade.rename_xmlids( + cr, [ + ('queue_job.group_connector_manager', + 'queue_job.group_queue_job_manager',) + ], + ) From ad095954a25ac3b78aff67ceb306b759820f5238 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Tue, 29 Aug 2017 19:44:19 +0200 Subject: [PATCH 2/4] Update pre-migration.py --- queue_job/migrations/10.0.1.0.0/pre-migration.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/queue_job/migrations/10.0.1.0.0/pre-migration.py b/queue_job/migrations/10.0.1.0.0/pre-migration.py index 50d5020f8d..a144ea4769 100644 --- a/queue_job/migrations/10.0.1.0.0/pre-migration.py +++ b/queue_job/migrations/10.0.1.0.0/pre-migration.py @@ -6,8 +6,12 @@ def migrate(cr, version): if not version: return - # In order to migrate connector from v. 9.0 to v. 10.0, we need to set - # connector module state to 'to upgrade' + # In order to migrate connector from v9 to v10, we need to set + # connector module state to 'to upgrade'. If this is not done, all + # connector.* xmlids are removed due to the module renaming done by + # OpenUpgrade. In the future the approach sketched in + # https://github.com/OCA/queue/pull/23#issuecomment-325706811 + # may provide a more generic solution. cr.execute(""" UPDATE ir_module_module SET state='to upgrade' From 6c2d675c432c98335460eaa496becb194db5156d Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 30 Aug 2017 09:12:41 +0200 Subject: [PATCH 3/4] Update pre-migration.py --- queue_job/migrations/10.0.1.0.0/pre-migration.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/queue_job/migrations/10.0.1.0.0/pre-migration.py b/queue_job/migrations/10.0.1.0.0/pre-migration.py index a144ea4769..c5a310d83b 100644 --- a/queue_job/migrations/10.0.1.0.0/pre-migration.py +++ b/queue_job/migrations/10.0.1.0.0/pre-migration.py @@ -7,9 +7,9 @@ def migrate(cr, version): if not version: return # In order to migrate connector from v9 to v10, we need to set - # connector module state to 'to upgrade'. If this is not done, all - # connector.* xmlids are removed due to the module renaming done by - # OpenUpgrade. In the future the approach sketched in + # connector module state to 'to upgrade'. If this is not done, all + # connector.* xmlids are removed due to the module renaming done by + # OpenUpgrade. In the future the approach sketched in # https://github.com/OCA/queue/pull/23#issuecomment-325706811 # may provide a more generic solution. cr.execute(""" From f642f2586ed3e18cebc85f38925cb8d93a33181c Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Wed, 30 Aug 2017 09:45:58 +0200 Subject: [PATCH 4/4] Update pre-migration.py --- .../migrations/10.0.1.0.0/pre-migration.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/queue_job/migrations/10.0.1.0.0/pre-migration.py b/queue_job/migrations/10.0.1.0.0/pre-migration.py index c5a310d83b..db4c33a73f 100644 --- a/queue_job/migrations/10.0.1.0.0/pre-migration.py +++ b/queue_job/migrations/10.0.1.0.0/pre-migration.py @@ -17,10 +17,13 @@ def migrate(cr, version): SET state='to upgrade' WHERE name='connector' """) - from openupgradelib import openupgrade - openupgrade.rename_xmlids( - cr, [ - ('queue_job.group_connector_manager', - 'queue_job.group_queue_job_manager',) - ], - ) + try: + from openupgradelib import openupgrade + openupgrade.rename_xmlids( + cr, [ + ('queue_job.group_connector_manager', + 'queue_job.group_queue_job_manager',) + ], + ) + except ImportError: + pass