mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-22 08:55:15 +02:00
Code Issues Projects Releases Wiki Activity

MDL-50851 core_tag: fix db query failure on oracle

Browse Source
This commit is contained in:
Marina Glancy 2016-01-14 13:19:12 +08:00
parent 1002024cbc
commit 25430f75d1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blog/locallib.php
View File

@ -631,7 +631,7 @@ class blog_listing {
$allnamefields = \user_picture::fields('u', null, 'useridalias');
// The query used to locate blog entries is complicated. It will be built from the following components:
$requiredfields = "p.*, $allnamefields, u.email"; // The SELECT clause.
$requiredfields = "p.*, $allnamefields"; // The SELECT clause.
$tables = array('p' => 'post', 'u' => 'user'); // Components of the FROM clause (table_id => table_name).
// Components of the WHERE clause (conjunction).
$conditions = array('u.deleted = 0', 'p.userid = u.id', '(p.module = \'blog\' OR p.module = \'blog_external\')');

8
tag/classes/area.php
View File

@ -401,13 +401,15 @@ class core_tag_area {
$result->close();
// Find all tags that are used for this itemtype/component and are not present in the target tag collection.
$sql = "SELECT DISTINCT t.id, t.name, t.rawname, t.description, t.descriptionformat,
t.userid, t.tagtype, t.flag
// This query is a little complicated because Oracle does not allow to run SELECT DISTINCT on CLOB fields.
$sql = "SELECT id, name, rawname, description, descriptionformat, userid, tagtype, flag
FROM {tag} WHERE id IN
(SELECT t.id
FROM {tag_instance} ti
JOIN {tag} t ON t.id = ti.tagid AND t.tagcollid <> :tagcollid1
LEFT JOIN {tag} tt ON tt.name = t.name AND tt.tagcollid = :tagcollid2
WHERE ti.itemtype = :itemtype2 AND ti.component = :component2
AND tt.id IS NULL";
AND tt.id IS NULL)";
$todelete = array();
$result = $DB->get_records_sql($sql, $params);
foreach ($result as $tag) {