L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

"MDL-24862 revert previous change, sub query works better"

Browse Source
This commit is contained in:
Dongsheng Cai
2010-11-19 07:43:13 +00:00
parent f8df6aebcf
commit 49550e4964
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/wiki/db/upgrade.php
+12 -12
View File
@@ -216,18 +216,18 @@ function xmldb_wiki_upgrade($oldversion) {
// Step 8, migrating files
if ($oldversion < 2010040108) {
$fs = get_file_storage();
$sql = "SELECT DISTINCT po.pagename, w.id AS wikiid, po.userid,".
$DB->sql_compare_text('po.meta')." AS filemeta,
eo.id AS entryid, eo.groupid, s.id AS subwiki,
w.course AS courseid, cm.id AS cmid
FROM {wiki_pages_old} po
LEFT OUTER JOIN {wiki_entries_old} eo
ON eo.id=po.wiki
LEFT OUTER JOIN {wiki} w
ON w.id = eo.wikiid
LEFT OUTER JOIN {wiki_subwikis} s
ON s.groupid = eo.groupid AND s.wikiid = eo.wikiid AND eo.userid = s.userid
JOIN {modules} m ON m.name = 'wiki'
$sql = "SELECT files.*, po.meta AS filemeta FROM {wiki_pages_old} po JOIN (
SELECT DISTINCT po.id, po.pagename, w.id AS wikiid, po.userid,
eo.id AS entryid, eo.groupid, s.id AS subwiki,
w.course AS courseid, cm.id AS cmid
FROM {wiki_pages_old} po
LEFT OUTER JOIN {wiki_entries_old} eo
ON eo.id=po.wiki
LEFT OUTER JOIN {wiki} w
ON w.id = eo.wikiid
LEFT OUTER JOIN {wiki_subwikis} s
ON s.groupid = eo.groupid AND s.wikiid = eo.wikiid AND eo.userid = s.userid
JOIN {modules} m ON m.name = 'wiki'
JOIN {course_modules} cm ON (cm.module = m.id AND cm.instance = w.id)
) files ON files.id = po.id";