Merge pull request #20541 from eileenmcnaughton/alpha_trigg

Sort trigger data before processing
civicrm · Jun 8, 2021 · a6f6f86 · a6f6f86
2 parents 94915ae + 9b0ff7e
commit a6f6f86
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CRM/Logging/Schema.php b/CRM/Logging/Schema.php
@@ -242,6 +242,9 @@ public function dropTriggers($tableName = NULL) {
       $tableNames = $this->tables;
     }
 
+    // Sort the table names so the sql output is consistent for those sites
+    // loading it asynchronously (using the setting 'logging_no_trigger_permission')
+    asort($tableNames);
     foreach ($tableNames as $table) {
       $validName = CRM_Core_DAO::shortenSQLName($table, 48, TRUE);
 

diff --git a/Civi/Core/SqlTriggers.php b/Civi/Core/SqlTriggers.php
@@ -138,6 +138,10 @@ public function createTriggers($info, $onlyTableName = NULL) {
       }
     }
 
+    // Sort tables alphabetically in order to output in a consistent order
+    // for sites that like to diff this output over time
+    // (ie. with the logging_no_trigger_permission setting in place).
+    asort($triggers);
     // now spit out the sql
     foreach ($triggers as $tableName => $tables) {
       if ($onlyTableName != NULL && $onlyTableName != $tableName) {