Revert "MDL-31914 Ensure that completion criteria are deleted when re…

…moving a course module"

This reverts commit a8a0767.

course/lib.php

@@ -2836,7 +2836,6 @@ function delete_course_module($id) {
     // very quick on an empty table)
     $DB->delete_records('course_modules_completion', array('coursemoduleid' => $cm->id));
     $DB->delete_records('course_modules_availability', array('coursemoduleid'=> $cm->id));
-    $DB->delete_records('course_completion_criteria', array('moduleinstance'=> $cm->id));
 
     delete_context(CONTEXT_MODULE, $cm->id);
     return $DB->delete_records('course_modules', array('id'=>$cm->id));

lib/db/upgrade.php

@@ -6762,25 +6762,6 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2011070104.12);
     }
 
-    if ($oldversion < 2011070105.03) {
-        // Delete orphaned criteria which were left when modules were removed
-        if ($DB->get_dbfamily() === 'mysql') {
-            $sql = "DELETE cc FROM {course_completion_criteria} cc
-                    LEFT JOIN {course_modules} cm ON cm.id = cc.moduleinstance
-                    WHERE cm.id IS NULL";
-        } else {
-            $sql = "DELETE FROM {course_completion_criteria}
-                    WHERE NOT EXISTS (
-                        SELECT 'x' FROM {course_modules}
-                        WHERE {course_modules}.id = {course_completion_criteria}.moduleinstance)";
-        }
-        $DB->execute($sql);
-
-        // Main savepoint reached
-        upgrade_main_savepoint(true, 2011070105.03);
-    }
-
-
     return true;
 }
 

version.php

@@ -30,7 +30,7 @@
 defined('MOODLE_INTERNAL') || die();
 
 
-$version  = 2011070105.03;              // 20110701      = branching date YYYYMMDD - do not modify!
+$version  = 2011070105.02;              // 20110701      = branching date YYYYMMDD - do not modify!
                                         //         RR    = release increments - 00 in DEV branches
                                         //           .XX = incremental changes