wiki MDL-24862 fixed the upgrade code breaking in mssql.

roddle · Nov 19, 2010 · bb7603e · bb7603e
1 parent dbfcdb8
commit bb7603e
Showing 1 changed file with 12 additions and 12 deletions.
diff --git 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 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'
+        $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'
                         JOIN {course_modules} cm ON (cm.module = m.id AND cm.instance = w.id)
                 ) files ON files.id = po.id";