Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
moodle
moodle
Commits
25430f75
Commit
25430f75
authored
Jan 14, 2016
by
Marina Glancy
Browse files
MDL-50851 core_tag: fix db query failure on oracle
parent
1002024c
Changes
2
Hide whitespace changes
Inline
Side-by-side
blog/locallib.php
View file @
25430f75
...
...
@@ -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\')'
);
...
...
tag/classes/area.php
View file @
25430f75
...
...
@@ -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
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment