From af38636c1b726f2c3b0e4aa14d9b400aab820036 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 28 Feb 2022 16:45:10 -0800
Subject: [PATCH] QueueItem - Upgrades from <v4.2 are not supported. Remove
 special createTable().

---
 CRM/Queue/BAO/QueueItem.php    | 19 ++-----------------
 sql/civicrm_queue_item.mysql   | 33 ---------------------------------
 xml/schema/Queue/Queue.xml     |  4 ----
 xml/schema/Queue/QueueItem.xml |  3 +--
 4 files changed, 3 insertions(+), 56 deletions(-)
 delete mode 100644 sql/civicrm_queue_item.mysql

diff --git a/CRM/Queue/BAO/QueueItem.php b/CRM/Queue/BAO/QueueItem.php
index 64a415b0da..2051d7b5bb 100644
--- a/CRM/Queue/BAO/QueueItem.php
+++ b/CRM/Queue/BAO/QueueItem.php
@@ -33,29 +33,14 @@ class CRM_Queue_BAO_QueueItem extends CRM_Queue_DAO_QueueItem {
    */
   public static function findCreateTable(): bool {
     if (!CRM_Core_DAO::checkTableExists('civicrm_queue_item')) {
-      return static::createTable();
+      // Table originated in 4.2. We no longer support direct upgrades from <=4.2. Don't bother trying to create table.
+      return FALSE;
     }
     else {
       return static::updateTable();
     }
   }
 
-  /**
-   * Create the `civicrm_queue_item` table.
-   *
-   * @return bool
-   * @throws \CRM_Core_Exception
-   */
-  protected static function createTable(): bool {
-    // civicrm/sql/civicrm_queue_item.mysql
-    $fileName = dirname(__FILE__) . '/../../../sql/civicrm_queue_item.mysql';
-
-    $config = CRM_Core_Config::singleton();
-    CRM_Utils_File::sourceSQLFile($config->dsn, $fileName);
-
-    return CRM_Core_DAO::checkTableExists('civicrm_queue_item');
-  }
-
   /**
    * Ensure that the `civicrm_queue_item` table is up-to-date.
    *
diff --git a/sql/civicrm_queue_item.mysql b/sql/civicrm_queue_item.mysql
deleted file mode 100644
index 9ccffb56f4..0000000000
--- a/sql/civicrm_queue_item.mysql
+++ /dev/null
@@ -1,33 +0,0 @@
--- This code has been copied from the auto-generated civicrm.mysql
--- It is required to facilitate queue-backed upgrades.
-
--- /*******************************************************
--- *
--- * civicrm_queue_item
--- *
--- * Stores a list of queue items
--- *
--- *******************************************************/
-CREATE TABLE `civicrm_queue_item` (
-
-
-     `id` int unsigned NOT NULL AUTO_INCREMENT  ,
-     `queue_name` varchar(64) NOT NULL   COMMENT 'Name of the queue which includes this item',
-     `weight` int NOT NULL   ,
-     `submit_time` datetime NOT NULL   COMMENT 'date on which this item was submitted to the queue',
-     `release_time` datetime    COMMENT 'date on which this job becomes available; null if ASAP',
-     `retry_interval` int NULL COMMENT 'Number of seconds to wait before retrying a failed execution. NULL to disable.',
-     `retry_count` int NULL COMMENT 'Number of permitted retries. Decreases with each retry. NULL to disable.',
-
-     `data` text    COMMENT 'Serialized queue'
-,
-    PRIMARY KEY ( `id` )
-
-    ,     INDEX `index_queueids`(
-        `queue_name`
-      , `weight`
-      , `id`
-  )
-
-
-)  ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci  ;
diff --git a/xml/schema/Queue/Queue.xml b/xml/schema/Queue/Queue.xml
index 947e907f01..1f192a6ba6 100644
--- a/xml/schema/Queue/Queue.xml
+++ b/xml/schema/Queue/Queue.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 
 <table>
-  <!--
-    NOTE: To facilitate upgrades, manually copy the CREATE TABLE statement
-    from sql/civicrm.mysql to sql/civicrm_queue_item.mysql
-  -->
   <base>CRM/Queue</base>
   <class>Queue</class>
   <name>civicrm_queue</name>
diff --git a/xml/schema/Queue/QueueItem.xml b/xml/schema/Queue/QueueItem.xml
index 3d3bea186b..782421f15a 100644
--- a/xml/schema/Queue/QueueItem.xml
+++ b/xml/schema/Queue/QueueItem.xml
@@ -2,8 +2,7 @@
 
 <table>
   <!--
-    NOTE: To facilitate upgrades, manually copy the CREATE TABLE statement
-    from sql/civicrm.mysql to sql/civicrm_queue_item.mysql
+    NOTE: To facilitate upgrades, manually copy any ALTER TABLE statements to CRM_Queue_BAO_QueueItem.
   -->
   <base>CRM/Queue</base>
   <class>QueueItem</class>
-- 
2.25.1