dev/core#4472 Drop Index that is not actually needed only recently added for priority...

diff --git a/CRM/ACL/DAO/ACL.php b/CRM/ACL/DAO/ACL.php
index 5459a2e91125f1f94d01cf49cf70cf77e0a98e88..388d638e1d69b3c92d8d60f379ecb1415f3bbfde 100644 (file)
--- a/CRM/ACL/DAO/ACL.php
+++ b/CRM/ACL/DAO/ACL.php
@@ -6,7 +6,7 @@
  *
  * Generated from xml/schema/CRM/ACL/ACL.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:e9000e92e55c139962db398047f4800c)
+ * (GenCodeChecksum:cccf24b98d7147b2f5e237fcb0a54295)
  */
 
 /**
@@ -542,14 +542,6 @@ class CRM_ACL_DAO_ACL extends CRM_Core_DAO {
         'localizable' => FALSE,
         'sig' => 'civicrm_acl::0::acl_id',
       ],
-      'index_priority' => [
-        'name' => 'index_priority',
-        'field' => [
-          0 => 'priority',
-        ],
-        'localizable' => FALSE,
-        'sig' => 'civicrm_acl::0::priority',
-      ],
     ];
     return ($localize && !empty($indices)) ? CRM_Core_DAO_AllCoreTables::multilingualize(__CLASS__, $indices) : $indices;
   }

diff --git a/CRM/Upgrade/Incremental/php/FiveSixtyFive.php b/CRM/Upgrade/Incremental/php/FiveSixtyFive.php
index f764922a18eb5b7f9fb5f151c8cc22333c134cc3..40a02d2c9f93345d20d12dbe199ac3033597f68f 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FiveSixtyFive.php
+++ b/CRM/Upgrade/Incremental/php/FiveSixtyFive.php
@@ -44,6 +44,11 @@ class CRM_Upgrade_Incremental_php_FiveSixtyFive extends CRM_Upgrade_Incremental_
     $this->addTask('Update New Price Set path', 'updateNewPriceSetPath');
   }
 
+  public function upgrade_5_65_beta1($rev): void {
+    // This index isn't really needed, and it was only created on some sites. See: dev/core#4472
+    $this->addTask('Drop "civicrm_acl.index_priority"', 'dropIndex', 'civicrm_acl', 'index_priority');
+  }
+
   /**
    * dev/financial#216 Remove the Create/Edit Batch Activity Types if they were
    * never used. Otherwise we leave them there for now, and extension could

diff --git a/xml/schema/ACL/ACL.xml b/xml/schema/ACL/ACL.xml
index 9534bbc7e5c75382c951c25864cbfd6b409d25f6..8a19fab23a4c96ed01f7e934d5b0c5ea9e8d2dc4 100644 (file)
--- a/xml/schema/ACL/ACL.xml
+++ b/xml/schema/ACL/ACL.xml
@@ -161,8 +161,4 @@
       <type>Number</type>
     </html>
   </field>
-  <index>
-    <name>index_priority</name>
-    <fieldName>priority</fieldName>
-  </index>
 </table>