From d66122e2a8629e883cf6f6f9ae26562d0ea469d2 Mon Sep 17 00:00:00 2001 From: mjollnir_ Date: Thu, 18 Nov 2004 02:33:49 +0000 Subject: [PATCH] Replaced prefix_ with CFG->prefix for DROP of indexes before creation because of being inside execute_sql rather than modify_database - assignment module --- mod/assignment/db/mysql.php | 10 +++++----- mod/assignment/db/postgres7.php | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mod/assignment/db/mysql.php b/mod/assignment/db/mysql.php index acb78d211b..031f97f010 100644 --- a/mod/assignment/db/mysql.php +++ b/mod/assignment/db/mysql.php @@ -100,11 +100,11 @@ function assignment_upgrade($oldversion) { } if ($oldversion < 2004111200) { - execute_sql('ALTER TABLE prefix_assignment DROP INDEX course;',false); - execute_sql('ALTER TABLE prefix_assignment_submissions DROP INDEX assignment;',false); - execute_sql('ALTER TABLE prefix_assignment_submissions DROP INDEX userid;',false); - execute_sql('ALTER TABLE prefix_assignment_submissions DROP INDEX mailed;',false); - execute_sql('ALTER TABLE prefix_assignment_submissions DROP INDEX timemarked;',false); + execute_sql("ALTER TABLE {$CFG->prefix}assignment DROP INDEX course;",false); + execute_sql("ALTER TABLE {$CFG->prefix}assignment_submissions DROP INDEX assignment;",false); + execute_sql("ALTER TABLE {$CFG->prefix}assignment_submissions DROP INDEX userid;",false); + execute_sql("ALTER TABLE {$CFG->prefix}assignment_submissions DROP INDEX mailed;",false); + execute_sql("ALTER TABLE {$CFG->prefix}assignment_submissions DROP INDEX timemarked;",false); modify_database('','ALTER TABLE prefix_assignment ADD INDEX course (course);'); modify_database('','ALTER TABLE prefix_assignment_submissions ADD INDEX assignment(assignment);'); diff --git a/mod/assignment/db/postgres7.php b/mod/assignment/db/postgres7.php index 58220f3431..4fadbf5737 100644 --- a/mod/assignment/db/postgres7.php +++ b/mod/assignment/db/postgres7.php @@ -98,11 +98,11 @@ function assignment_upgrade($oldversion) { } if ($oldversion < 2004111200) { - execute_sql('DROP INDEX prefix_assignment_course_idx;',false); - execute_sql('DROP INDEX prefix_assignment_submissions_assignment_idx;',false); - execute_sql('DROP INDEX prefix_assignment_submissions_userid_idx;',false); - execute_sql('DROP INDEX prefix_assignment_submissions_mailed_idx;',false); - execute_sql('DROP INDEX prefix_assignment_submissions_timemarked_idx;',false); + execute_sql("DROP INDEX {$CFG->prefix}assignment_course_idx;",false); + execute_sql("DROP INDEX {$CFG->prefix}assignment_submissions_assignment_idx;",false); + execute_sql("DROP INDEX {$CFG->prefix}assignment_submissions_userid_idx;",false); + execute_sql("DROP INDEX {$CFG->prefix}assignment_submissions_mailed_idx;",false); + execute_sql("DROP INDEX {$CFG->prefix}assignment_submissions_timemarked_idx;",false); modify_database('','CREATE INDEX prefix_assignment_course_idx ON prefix_assignment (course);'); modify_database('','CREATE INDEX prefix_assignment_submissions_assignment_idx ON prefix_assignment_submissions (assignment);'); -- 2.39.5