From 454c7b5d3980584de0ecebcf7cbc5067589dcdd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0koda?= Date: Thu, 20 Mar 2014 17:06:28 +0800 Subject: [PATCH] MDL-44661 fix legacy log reader to ignore new anonymous field --- admin/tool/log/store/legacy/classes/log/store.php | 3 ++- admin/tool/log/store/legacy/tests/store_test.php | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/admin/tool/log/store/legacy/classes/log/store.php b/admin/tool/log/store/legacy/classes/log/store.php index c68c767c9a5..a8e981c627d 100644 --- a/admin/tool/log/store/legacy/classes/log/store.php +++ b/admin/tool/log/store/legacy/classes/log/store.php @@ -39,7 +39,8 @@ class store implements \tool_log\log\store, \core\log\sql_select_reader { 'timecreated' => 'time', 'courseid' => 'course', 'contextinstanceid' => 'cmid', - 'origin' => 'ip' + 'origin' => 'ip', + 'anonymous' => 0, ); /** @var string Regex to replace the crud params */ diff --git a/admin/tool/log/store/legacy/tests/store_test.php b/admin/tool/log/store/legacy/tests/store_test.php index c99f017ed61..89479dcf6b8 100644 --- a/admin/tool/log/store/legacy/tests/store_test.php +++ b/admin/tool/log/store/legacy/tests/store_test.php @@ -213,6 +213,11 @@ class logstore_legacy_store_testcase extends advanced_testcase { list($updatewhere, $replaceparams) = \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params); $this->assertEquals("edulevel = 0 and action LIKE '%update%' OR action NOT LIKE '%view%' AND action NOT LIKE '%report%' or action NOT LIKE '%delete%'", $updatewhere); + // The anonymous select returns all data. + $selectwhere = "anonymous = 0"; + list($updatewhere, $replaceparams) = \logstore_legacy\test\unittest_logstore_legacy::replace_sql_legacy($selectwhere, $params); + $this->assertSame("0 = 0", $updatewhere); + // Test legacy field names are mapped. $selectwhere = "timecreated = :timecreated and courseid = :courseid and contextinstanceid = :contextinstanceid and origin = :origin"; $params = array('timecreated' => 2, 'courseid' => 3, 'contextinstanceid' => 4, 'origin' => 5 );