L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged from MOODLE_14_STABLE: Indexes for journal and version bump (honoring partial freeze)

Browse Source
This commit is contained in:
mjollnir_
2004-11-19 02:02:38 +00:00
parent ab0f642d80
commit 58336c87a2
5 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/journal/db/mysql.php
+9
View File
@@ -47,6 +47,15 @@ function journal_upgrade($oldversion) {
table_column("journal", "", "introformat", "integer", "2", "", "1", "not null", "intro");
}
if ($oldversion < 2004111200) {
execute_sql("ALTER TABLE {$CFG->prefix}journal DROP INDEX course;",false);
execute_sql("ALTER TABLE {$CFG->prefix}journal_entries DROP INDEX journal;",false);
execute_sql("ALTER TABLE {$CFG->prefix}journal_entries DROP INDEX userid;",false);
modify_database('','ALTER TABLE prefix_journal ADD INDEX course (course);');
modify_database('','ALTER TABLE prefix_journal_entries ADD INDEX journal (journal);');
modify_database('','ALTER TABLE prefix_journal_entries ADD INDEX userid (userid);');
}
return $result;
}
mod/journal/db/mysql.sql
+5 -2
View File
@@ -23,7 +23,8 @@ CREATE TABLE prefix_journal (
days smallint(5) unsigned NOT NULL default '7',
assessed int(10) NOT NULL default '0',
timemodified int(10) unsigned NOT NULL default '0',
PRIMARY KEY (id)
PRIMARY KEY (id),
KEY course (course)
) TYPE=MyISAM;
# --------------------------------------------------------
@@ -43,7 +44,9 @@ CREATE TABLE prefix_journal_entries (
teacher int(10) unsigned NOT NULL default '0',
timemarked int(10) unsigned NOT NULL default '0',
mailed int(1) unsigned NOT NULL default '0',
PRIMARY KEY (id)
PRIMARY KEY (id),
KEY journal (journal),
KEY userid (userid)
) TYPE=MyISAM COMMENT='All the journal entries of all people';
#
mod/journal/db/postgres7.php
+9
View File
@@ -30,6 +30,15 @@ function journal_upgrade($oldversion) {
table_column("journal", "", "introformat", "integer", "2", "", "1", "not null", "intro");
}
if ($oldversion < 2004111200) {
execute_sql("DROP INDEX {$CFG->prefix}journal_course_idx;",false);
execute_sql("DROP INDEX {$CFG->prefix}journal_entries_journal_idx;",false);
execute_sql("DROP INDEX {$CFG->prefix}journal_entries_userid_idx;",false);
modify_database('','CREATE INDEX prefix_journal_course_idx ON prefix_journal (course);');
modify_database('','CREATE INDEX prefix_journal_entries_journal_idx ON prefix_journal_entries (journal);');
modify_database('','CREATE INDEX prefix_journal_entries_userid_idx ON prefix_journal_entries (userid);');
}
return $result;
}
mod/journal/db/postgres7.sql
+6
View File
@@ -24,6 +24,9 @@ CREATE TABLE prefix_journal (
assessed integer NOT NULL default '0',
timemodified integer NOT NULL default '0'
);
CREATE INDEX prefix_journal_course_idx ON prefix_journal (course);
# --------------------------------------------------------
#
@@ -44,6 +47,9 @@ CREATE TABLE prefix_journal_entries (
mailed integer NOT NULL default '0'
);
CREATE INDEX prefix_journal_entries_journal_idx ON prefix_journal_entries (journal);
CREATE INDEX prefix_journal_entries_userid_idx ON prefix_journal_entries (userid);
#
# Dumping data for table `log_display`
#
mod/journal/version.php
+1 -1
View File
@@ -5,7 +5,7 @@
// This fragment is called by /admin/index.php
////////////////////////////////////////////////////////////////////////////////
$module->version = 2004060400;
$module->version = 2004111200;
$module->requires = 2004052505; // Requires this Moodle version
$module->cron = 60;