From 49550e4964f1228bdbf8ed5ea323239d4c70a9fd Mon Sep 17 00:00:00 2001 From: Dongsheng Cai Date: Fri, 19 Nov 2010 07:43:13 +0000 Subject: [PATCH] "MDL-24862 revert previous change, sub query works better" --- mod/wiki/db/upgrade.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/mod/wiki/db/upgrade.php b/mod/wiki/db/upgrade.php index 1fe83028676..6a2fe92e95e 100644 --- a/mod/wiki/db/upgrade.php +++ b/mod/wiki/db/upgrade.php @@ -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";