Merge "Bug 1850786: remove plugin ES triggers"

htdocs/lib/db/upgrade.php

@@ -1542,5 +1542,15 @@ function xmldb_core_upgrade($oldversion=0) {
         }
     }
 
+    if ($oldversion < 2019111100) {
+        log_debug('Drop the elasticsearch triggers for the plugins');
+        require_once(get_config('docroot') . 'search/elasticsearch/lib.php');
+        $enabledtypes = explode(',', get_config_plugin('search', 'elasticsearch', 'types'));
+        foreach ($enabledtypes as $type) {
+            ElasticsearchIndexing::drop_triggers($type);
+        }
+        ElasticsearchIndexing::drop_trigger_functions();
+    }
+
     return $status;
 }

htdocs/lib/version.php

@@ -16,7 +16,7 @@ $config = new stdClass();
 // See https://wiki.mahara.org/wiki/Developer_Area/Version_Numbering_Policy
 // For upgrades on stable branches, increment the version by one.  On master, use the date.
 
-$config->version = 2019102000;
+$config->version = 2019111100;
 $config->series = '20.04';
 $config->release = '20.04dev';
 $config->minupgradefrom = 2017031605;