MDL-57791 analytics: Compatibility with oracle

Also moved predictions test to analytics/tests/prediction_test.php
abgreeve · Jul 24, 2017 · 466f683 · 466f683
1 parent 382a089
commit 466f683
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/analytics/classes/manager.php b/analytics/classes/manager.php
@@ -84,7 +84,9 @@ public static function get_all_models($enabled = false, $trained = false, $predi
 
         $params = array();
 
-        $sql = "SELECT DISTINCT am.* FROM {analytics_models} am";
+        $fields = 'am.id, am.enabled, am.trained, am.target, ' . $DB->sql_compare_text('am.indicators') .
+            ', am.timesplitting, am.version, am.timecreated, am.timemodified, am.usermodified';
+        $sql = "SELECT DISTINCT $fields FROM {analytics_models} am";
         if ($predictioncontext) {
             $sql .= " JOIN {analytics_predictions} ap ON ap.modelid = am.id AND ap.contextid = :contextid";
             $params['contextid'] = $predictioncontext->id;

diff --git a/analytics/tests/ma_test.php → analytics/tests/prediction_test.php b/analytics/tests/ma_test.php → analytics/tests/prediction_test.php