From 6b139edaf91f8a4e98c3e8dd95ef8502cc73b1c8 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Fri, 18 Apr 2014 17:34:06 +0200 Subject: [PATCH] MDL-45171 log reports: fix sql for cross support Rules for cross-db support are: - Always use the 'AS' keyword for columns. - Never use the 'AS' keyword for tables/views. --- report/log/classes/table_log.php | 4 ++-- report/loglive/classes/table_log.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/report/log/classes/table_log.php b/report/log/classes/table_log.php index a41c0dae315..76ed0934766 100644 --- a/report/log/classes/table_log.php +++ b/report/log/classes/table_log.php @@ -481,7 +481,7 @@ class report_log_table_log extends table_sql { $ccselect = ', ' . context_helper::get_preload_record_columns_sql('ctx'); $ccjoin = "LEFT JOIN {context} ctx ON (ctx.instanceid = c.id AND ctx.contextlevel = :contextlevel)"; $courseparams['contextlevel'] = CONTEXT_COURSE; - $sql = "SELECT c.id,c.shortname $ccselect FROM {course} as c + $sql = "SELECT c.id,c.shortname $ccselect FROM {course} c $ccjoin WHERE c.id " . $coursesql; @@ -496,4 +496,4 @@ class report_log_table_log extends table_sql { } } } -} \ No newline at end of file +} diff --git a/report/loglive/classes/table_log.php b/report/loglive/classes/table_log.php index 04614b68721..c124de6909a 100644 --- a/report/loglive/classes/table_log.php +++ b/report/loglive/classes/table_log.php @@ -387,7 +387,7 @@ class report_loglive_table_log extends table_sql { $ccselect = ', ' . context_helper::get_preload_record_columns_sql('ctx'); $ccjoin = "LEFT JOIN {context} ctx ON (ctx.instanceid = c.id AND ctx.contextlevel = :contextlevel)"; $courseparams['contextlevel'] = CONTEXT_COURSE; - $sql = "SELECT c.id,c.shortname $ccselect FROM {course} as c + $sql = "SELECT c.id,c.shortname $ccselect FROM {course} c $ccjoin WHERE c.id " . $coursesql;