From 46b0d8f91ef54b777dde55eb0d6881c90671d170 Mon Sep 17 00:00:00 2001
From: Bastian Guenther <Bastian.Guenther@ametras.com>
Date: Thu, 10 Apr 2025 14:34:56 +0200
Subject: [PATCH] [FIX] queue_job: Adapted migration to properly delete the
 invalid cron job

---
 queue_job/__manifest__.py                     |  2 +-
 .../migrations/17.0.1.2.0/pre-migration.py    | 22 -------------------
 .../migrations/17.0.1.3.1/pre-migration.py    | 11 ++++++++++
 3 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 queue_job/migrations/17.0.1.2.0/pre-migration.py
 create mode 100644 queue_job/migrations/17.0.1.3.1/pre-migration.py

diff --git a/queue_job/__manifest__.py b/queue_job/__manifest__.py
index 5e67869b41..7433bdfdbe 100644
--- a/queue_job/__manifest__.py
+++ b/queue_job/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     "name": "Job Queue",
-    "version": "17.0.1.3.0",
+    "version": "17.0.1.3.1",
     "author": "Camptocamp,ACSONE SA/NV,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/queue",
     "license": "LGPL-3",
diff --git a/queue_job/migrations/17.0.1.2.0/pre-migration.py b/queue_job/migrations/17.0.1.2.0/pre-migration.py
deleted file mode 100644
index 8dbb6ff7f1..0000000000
--- a/queue_job/migrations/17.0.1.2.0/pre-migration.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
-
-
-def migrate(cr, version):
-    # Deactivate cron garbage collector
-    cr.execute(
-        """
-            UPDATE
-                ir_cron
-            SET
-                active=False
-            WHERE id IN (
-                SELECT res_id
-                FROM
-                    ir_model_data
-                WHERE
-                    module='queue_job'
-                    AND model='ir.cron'
-                    AND name='ir_cron_queue_job_garbage_collector'
-            );
-        """
-    )
diff --git a/queue_job/migrations/17.0.1.3.1/pre-migration.py b/queue_job/migrations/17.0.1.3.1/pre-migration.py
new file mode 100644
index 0000000000..931c336866
--- /dev/null
+++ b/queue_job/migrations/17.0.1.3.1/pre-migration.py
@@ -0,0 +1,11 @@
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    # Remove cron garbage collector
+    openupgrade.delete_records_safely_by_xml_id(
+        env,
+        ["queue_job.ir_cron_queue_job_garbage_collector"],
+    )