small fix for the removal of orphan records

diff --git a/mod/hotpot/db/mysql.php b/mod/hotpot/db/mysql.php
index a867684f77bc2a65e2bc0b9e1c13d045d890404b..bf4234dcbd64997cd3c324928842ca56654e7e96 100644 (file)
--- a/mod/hotpot/db/mysql.php
+++ b/mod/hotpot/db/mysql.php
@@ -1,43 +1,43 @@
-<?PHP\r
-function hotpot_upgrade($oldversion) {\r
-       global $CFG;\r
-       $ok = true;\r
-\r
-       if ($oldversion < 2004021400) {\r
-               execute_sql(" ALTER TABLE `{$CFG->prefix}hotpot_events` ADD `starttime` INT(10) unsigned NOT NULL DEFAULT '0' AFTER `time`");\r
-               execute_sql(" ALTER TABLE `{$CFG->prefix}hotpot_events` ADD `endtime` INT(10) unsigned NOT NULL DEFAULT '0' AFTER `time`");\r
-       }\r
-\r
-       // set path to update functions\r
-       $update_to_v2 = "$CFG->dirroot/mod/hotpot/db/update_to_v2.php";\r
-\r
-       // update from HotPot v1 to HotPot v2\r
-       if ($oldversion < 2005031400) {\r
-               require_once $update_to_v2;\r
-               $ok = $ok && hotpot_update_to_v2_from_v1();\r
-       }\r
-       if ($oldversion < 2005090700) {\r
-               require_once $update_to_v2;\r
-               $ok = $ok && hotpot_update_to_v2_1();\r
-       }\r
-       if ($oldversion > 2005031419 && $oldversion < 2005090702) {\r
-               // update to from HotPot v2.1.0 or v2.1.1\r
-               require_once $update_to_v2;\r
-               $ok = $ok && hotpot_update_to_v2_1_2();\r
-       }\r
-       if ($oldversion < 2006042103) {\r
-               require_once $update_to_v2;\r
-               $ok = $ok && hotpot_update_to_v2_1_16();\r
-       }\r
-       if ($oldversion < 2006042601) {\r
-               require_once $update_to_v2;\r
-               $ok = $ok && hotpot_update_to_v2_1_17();\r
-       }\r
-       if ($oldversion < 2006042800) {\r
-               require_once $update_to_v2;\r
-               $ok = $ok && hotpot_update_to_v2_1_18();\r
-       }\r
-\r
-       return $ok;\r
-}\r
-?>\r
+<?PHP
+function hotpot_upgrade($oldversion) {
+       global $CFG;
+       $ok = true;
+
+       if ($oldversion < 2004021400) {
+               execute_sql(" ALTER TABLE `{$CFG->prefix}hotpot_events` ADD `starttime` INT(10) unsigned NOT NULL DEFAULT '0' AFTER `time`");
+               execute_sql(" ALTER TABLE `{$CFG->prefix}hotpot_events` ADD `endtime` INT(10) unsigned NOT NULL DEFAULT '0' AFTER `time`");
+       }
+
+       // set path to update functions
+       $update_to_v2 = "$CFG->dirroot/mod/hotpot/db/update_to_v2.php";
+
+       // update from HotPot v1 to HotPot v2
+       if ($oldversion < 2005031400) {
+               require_once $update_to_v2;
+               $ok = $ok && hotpot_update_to_v2_from_v1();
+       }
+       if ($oldversion < 2005090700) {
+               require_once $update_to_v2;
+               $ok = $ok && hotpot_update_to_v2_1();
+       }
+       if ($oldversion > 2005031419 && $oldversion < 2005090702) {
+               // update to from HotPot v2.1.0 or v2.1.1
+               require_once $update_to_v2;
+               $ok = $ok && hotpot_update_to_v2_1_2();
+       }
+       if ($oldversion < 2006042103) {
+               require_once $update_to_v2;
+               $ok = $ok && hotpot_update_to_v2_1_16();
+       }
+       if ($oldversion < 2006042601) {
+               require_once $update_to_v2;
+               $ok = $ok && hotpot_update_to_v2_1_17();
+       }
+       if ($oldversion < 2006042801) {
+               require_once $update_to_v2;
+               $ok = $ok && hotpot_update_to_v2_1_18();
+       }
+
+       return $ok;
+}
+?>

diff --git a/mod/hotpot/db/postgres7.php b/mod/hotpot/db/postgres7.php
index ac898bc32ff29e72fdc9158f38372f9db8ea1f49..63baf900d8e20d7df940c340dc4caa34743a8a2f 100644 (file)
--- a/mod/hotpot/db/postgres7.php
+++ b/mod/hotpot/db/postgres7.php
@@ -1,46 +1,46 @@
-<?PHP\r
-function hotpot_upgrade($oldversion) {\r
-       global $CFG;\r
-       $ok = true;\r
-\r
-       // set path to update functions\r
-       $update_to_v2 = "$CFG->dirroot/mod/hotpot/db/update_to_v2.php";\r
-\r
-       // update from HotPot v1 to HotPot v2\r
-       if ($oldversion < 2005031400) {\r
-               require_once $update_to_v2;\r
-               $ok = $ok && hotpot_update_to_v2_from_v1();\r
-       }\r
-       // update to HotPot v2.1\r
-       if ($oldversion < 2005090700) {\r
-               require_once $update_to_v2;\r
-               $ok = $ok && hotpot_update_to_v2_1();\r
-       }\r
-       if ($oldversion > 2005031419 && $oldversion < 2005090702) {\r
-               // update to from HotPot v2.1.0 or v2.1.1\r
-               require_once $update_to_v2;\r
-               $ok = $ok && hotpot_update_to_v2_1_2();\r
-       }\r
-       if ($oldversion < 2005090706) {\r
-               require_once $update_to_v2;\r
-               $ok = $ok && hotpot_update_to_v2_1_6();\r
-       }\r
-       if ($oldversion < 2005090708) {\r
-               require_once $update_to_v2;\r
-               $ok = $ok && hotpot_update_to_v2_1_8();\r
-       }\r
-       if ($oldversion < 2006042103) {\r
-               require_once $update_to_v2;\r
-               $ok = $ok && hotpot_update_to_v2_1_16();\r
-       }\r
-       if ($oldversion < 2006042602) {\r
-               require_once $update_to_v2;\r
-               $ok = $ok && hotpot_update_to_v2_1_17();\r
-       }\r
-       if ($oldversion < 2006042800) {\r
-               require_once $update_to_v2;\r
-               $ok = $ok && hotpot_update_to_v2_1_18();\r
-       }\r
-       return $ok;\r
-}\r
-?>\r
+<?PHP
+function hotpot_upgrade($oldversion) {
+       global $CFG;
+       $ok = true;
+
+       // set path to update functions
+       $update_to_v2 = "$CFG->dirroot/mod/hotpot/db/update_to_v2.php";
+
+       // update from HotPot v1 to HotPot v2
+       if ($oldversion < 2005031400) {
+               require_once $update_to_v2;
+               $ok = $ok && hotpot_update_to_v2_from_v1();
+       }
+       // update to HotPot v2.1
+       if ($oldversion < 2005090700) {
+               require_once $update_to_v2;
+               $ok = $ok && hotpot_update_to_v2_1();
+       }
+       if ($oldversion > 2005031419 && $oldversion < 2005090702) {
+               // update to from HotPot v2.1.0 or v2.1.1
+               require_once $update_to_v2;
+               $ok = $ok && hotpot_update_to_v2_1_2();
+       }
+       if ($oldversion < 2005090706) {
+               require_once $update_to_v2;
+               $ok = $ok && hotpot_update_to_v2_1_6();
+       }
+       if ($oldversion < 2005090708) {
+               require_once $update_to_v2;
+               $ok = $ok && hotpot_update_to_v2_1_8();
+       }
+       if ($oldversion < 2006042103) {
+               require_once $update_to_v2;
+               $ok = $ok && hotpot_update_to_v2_1_16();
+       }
+       if ($oldversion < 2006042602) {
+               require_once $update_to_v2;
+               $ok = $ok && hotpot_update_to_v2_1_17();
+       }
+       if ($oldversion < 2006042801) {
+               require_once $update_to_v2;
+               $ok = $ok && hotpot_update_to_v2_1_18();
+       }
+       return $ok;
+}
+?>

diff --git a/mod/hotpot/db/update_to_v2.php b/mod/hotpot/db/update_to_v2.php
index 3d2cba9a4938957b593ed9eafac0fdd3da78d991..d5b33eaa427163df2f2f16eaa18c91bdf3ba3cda 100644 (file)
--- a/mod/hotpot/db/update_to_v2.php
+++ b/mod/hotpot/db/update_to_v2.php
@@ -12,7 +12,7 @@ function hotpot_update_to_v2_1_18() {
 
        return $ok;
 }
-function hotpot_remove_orphans($secondarytable, $secondarykeyfield, $primarytable, $primarykeyfield='id') {
+function hotpot_remove_orphans($secondarytable, $secondarykeyfield, $primarytable) {
        global $CFG,$db;
        $ok = true;
 
@@ -22,14 +22,14 @@ function hotpot_remove_orphans($secondarytable, $secondarykeyfield, $primarytabl
 
        $records = get_records_sql("
                SELECT 
-                       t2.$secondarykeyfield, t2.$secondarykeyfield
+                       t2.id, t2.id
                FROM 
                        {$CFG->prefix}$secondarytable AS t2 LEFT JOIN {$CFG->prefix}$primarytable AS t1 
-                       ON (t2.$secondarykeyfield = t1.$primarykeyfield)
+                       ON (t2.$secondarykeyfield = t1.id)
                WHERE 
-                       t1.$primarykeyfield IS NULL
+                       t1.id IS NULL
                ORDER BY 
-                       t2.$secondarykeyfield
+                       t2.id
        ");
 
        // restore SQL message echo setting
@@ -37,7 +37,7 @@ function hotpot_remove_orphans($secondarytable, $secondarykeyfield, $primarytabl
 
        if ($records) {
                $ids = implode(',', array_keys($records));
-               print 'removing '.count($ids).' orphan record(s) from {$CFG->prefix}$secondarytable (key=$secondarykeyfield) ...<br>';
+               print 'removing '.count($records)." orphan record(s) from {$CFG->prefix}$secondarytable<br>";
                $ok = $ok && execute_sql("DELETE FROM {$CFG->prefix}$secondarytable WHERE $secondarykeyfield IN ($ids)");
        }
 
@@ -71,7 +71,7 @@ function hotpot_denull_int_field($table, $field, $size) {
        global $CFG;
        $ok = true;
 
-       $ok = $ok && execute_sql("UPDATE {$CFG->prefix}$table SET $field=0 WHERE $field IS NULL");
+       $ok = $ok && execute_sql("UPDATE {$CFG->prefix}$table SET $field=0 WHERE $field IS NULL", false);
        $ok = $ok && hotpot_db_update_field_type($table, $field, $field, 'INTEGER', $size, 'UNSIGNED', 'NOT NULL', 0);
 
        return $ok;

diff --git a/mod/hotpot/version.php b/mod/hotpot/version.php
index 25644e89253cf856bb6bcd0ac9c3354e9e9815cb..b8bfff228ca0f6abbb8115f2806015f1c065c653 100644 (file)
--- a/mod/hotpot/version.php
+++ b/mod/hotpot/version.php
@@ -3,7 +3,7 @@
 ///  Code fragment to define the version of hotpot
 ///  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 /////////////////////////////////////////////////////////////////////////////////
-$module->version  = 2006042800;  // release date of this version (see note below)
+$module->version  = 2006042801;  // release date of this version (see note below)
 $module->release  = 'v2.1.18';    // human-friendly version name (used in mod/hotpot/lib.php)
 $module->cron     = 0;           // period for cron to check this module (secs)
 // interpretation of YYYYMMDDXY version numbers