mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity

MDL-67038 analytics: Remove null strings from the DB

Browse Source
This commit is contained in:
David Monllaó 2019-10-28 16:38:35 +08:00
parent d7699706da
commit ef05f29267
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/tool/analytics/model.php
View File

@ -159,6 +159,10 @@ switch ($action) {
$predictionsprocessor = false;
}
if (!isset($data->contexts)) {
$data->contexts = null;
}
$model->update($data->enabled, $indicators, $timesplitting, $predictionsprocessor, $data->contexts);
redirect($returnurl);
}

8
analytics/classes/model.php
View File

@ -493,13 +493,15 @@ class model {
$predictionsprocessor = $this->model->predictionsprocessor;
}
if ($contextids !== false) {
if ($contextids === false) {
$contextsstr = $this->model->contextids;
} else if (!$contextids) {
$contextsstr = null;
} else {
$contextsstr = json_encode($contextids);
// Reset the internal cache.
$this->contexts = null;
} else {
$contextsstr = $this->model->contextids;
}
if ($this->model->timesplitting !== $timesplittingid ||

9
lib/db/upgrade.php
View File

@ -3754,5 +3754,14 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2019102500.04);
}
if ($oldversion < 2019103000.13) {
$DB->execute("UPDATE {analytics_models} set contextids = null
WHERE contextids = :zero or contextids = :null", ['zero' => '0', 'null' => 'null']);
// Main savepoint reached.
upgrade_main_savepoint(true, 2019103000.13);
}
return true;
}

2
version.php
View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2019103000.00; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2019103000.13; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.