From 327613bcb66d13e6f25b05c7c644ff1469bb02dc Mon Sep 17 00:00:00 2001 From: mjollnir_ Date: Thu, 18 Nov 2004 02:42:33 +0000 Subject: [PATCH] Replaced prefix_ with CFG->prefix for DROP of indexes before creation because of being inside execute_sql rather than modify_database - exercise module --- mod/exercise/db/mysql.php | 12 ++++++------ mod/exercise/db/postgres7.php | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mod/exercise/db/mysql.php b/mod/exercise/db/mysql.php index fccbabc302..45c82108d8 100644 --- a/mod/exercise/db/mysql.php +++ b/mod/exercise/db/mysql.php @@ -41,12 +41,12 @@ function exercise_upgrade($oldversion) { } if ($oldversion < 2004111200) { - execute_sql('ALTER TABLE prefix_exercise DROP INDEX course;',false); - execute_sql('ALTER TABLE prefix_exercise_submissions DROP INDEX exerciseid;',false); - execute_sql('ALTER TABLE prefix_exercise_assessments DROP INDEX exerciseid;',false); - execute_sql('ALTER TABLE prefix_exercise_elements DROP INDEX exerciseid;',false); - execute_sql('ALTER TABLE prefix_exercise_rubrics DROP INDEX exerciseid;',false); - execute_sql('ALTER TABLE prefix_exercise_grades DROP INDEX exerciseid;',false); + execute_sql("ALTER TABLE {$CFG->prefix}exercise DROP INDEX course;",false); + execute_sql("ALTER TABLE {$CFG->prefix}exercise_submissions DROP INDEX exerciseid;",false); + execute_sql("ALTER TABLE {$CFG->prefix}exercise_assessments DROP INDEX exerciseid;",false); + execute_sql("ALTER TABLE {$CFG->prefix}exercise_elements DROP INDEX exerciseid;",false); + execute_sql("ALTER TABLE {$CFG->prefix}exercise_rubrics DROP INDEX exerciseid;",false); + execute_sql("ALTER TABLE {$CFG->prefix}exercise_grades DROP INDEX exerciseid;",false); modify_database('','ALTER TABLE prefix_exercise ADD INDEX course (course);'); modify_database('','ALTER TABLE prefix_exercise_submissions ADD INDEX exerciseid (exerciseid);'); diff --git a/mod/exercise/db/postgres7.php b/mod/exercise/db/postgres7.php index a12881fc33..b5ab4a7530 100644 --- a/mod/exercise/db/postgres7.php +++ b/mod/exercise/db/postgres7.php @@ -31,11 +31,11 @@ function exercise_upgrade($oldversion) { } if ($oldversion < 2004111200) { - execute_sql('DROP INDEX prefix_exercise_course_idx;',false); - execute_sql('DROP INDEX prefix_exercise_submissions_exerciseid_idx;',false); - execute_sql('DROP INDEX prefix_exercise_assessments_exerciseid_idx;',false); - execute_sql('DROP INDEX prefix_exercise_rubrics_exerciseid_idx;',false); - execute_sql('DROP INDEX prefix_exercise_grades_exerciseid_idx;',false); + execute_sql("DROP INDEX {$CFG->prefix}exercise_course_idx;",false); + execute_sql("DROP INDEX {$CFG->prefix}exercise_submissions_exerciseid_idx;",false); + execute_sql("DROP INDEX {$CFG->prefix}exercise_assessments_exerciseid_idx;",false); + execute_sql("DROP INDEX {$CFG->prefix}exercise_rubrics_exerciseid_idx;",false); + execute_sql("DROP INDEX {$CFG->prefix}exercise_grades_exerciseid_idx;",false); modify_database('','CREATE INDEX prefix_exercise_course_idx ON prefix_exercise (course);'); modify_database('','CREATE INDEX prefix_exercise_submissions_exerciseid_idx ON prefix_exercise_submissions (exerciseid);'); -- 2.39.5