http://www.mediawiki.org/wiki/Special:Code/MediaWiki/99530
Revision: 99530
Author: catrope
Date: 2011-10-11 18:40:27 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
Move all index creations to the main SQL file, and remove unnecessary updater
invocations
Modified Paths:
--------------
trunk/extensions/Contest/Contest.hooks.php
trunk/extensions/Contest/Contest.sql
Removed Paths:
-------------
trunk/extensions/Contest/sql/IndexChallengeContestId.sql
trunk/extensions/Contest/sql/IndexChallengeTitle.sql
trunk/extensions/Contest/sql/IndexCommentTime.sql
trunk/extensions/Contest/sql/IndexContestName.sql
trunk/extensions/Contest/sql/IndexContestStatus.sql
trunk/extensions/Contest/sql/IndexContestantInterests.sql
trunk/extensions/Contest/sql/IndexContestantRating.sql
trunk/extensions/Contest/sql/IndexContestantUserContest.sql
trunk/extensions/Contest/sql/IndexVoteContestantId.sql
trunk/extensions/Contest/sql/IndexVoteContestantUser.sql
trunk/extensions/Contest/sql/IndexVoteUserId.sql
Modified: trunk/extensions/Contest/Contest.hooks.php
===================================================================
--- trunk/extensions/Contest/Contest.hooks.php 2011-10-11 18:39:09 UTC (rev
99529)
+++ trunk/extensions/Contest/Contest.hooks.php 2011-10-11 18:40:27 UTC (rev
99530)
@@ -33,122 +33,6 @@
) );
$updater->addExtensionUpdate( array(
- 'addTable',
- 'contest_contestants',
- dirname( __FILE__ ) . '/Contest.sql',
- true
- ) );
-
- $updater->addExtensionUpdate( array(
- 'addTable',
- 'contest_challenges',
- dirname( __FILE__ ) . '/Contest.sql',
- true
- ) );
-
- $updater->addExtensionUpdate( array(
- 'addTable',
- 'contest_votes',
- dirname( __FILE__ ) . '/Contest.sql',
- true
- ) );
-
- $updater->addExtensionUpdate( array(
- 'addTable',
- 'contest_comments',
- dirname( __FILE__ ) . '/Contest.sql',
- true
- ) );
-
- $updater->addExtensionUpdate( array(
- 'addIndex',
- 'contests',
- 'contest_name',
- dirname( __FILE__ ) . '/sql/IndexContestName.sql',
- true
- ) );
-
- $updater->addExtensionUpdate( array(
- 'addIndex',
- 'contest_contestants',
- 'contestant_user_contest',
- dirname( __FILE__ ) .
'/sql/IndexContestantUserContest.sql',
- true
- ) );
-
- $updater->addExtensionUpdate( array(
- 'addIndex',
- 'contest_challenges',
- 'challenge_contest_id',
- dirname( __FILE__ ) .
'/sql/IndexChallengeContestId.sql',
- true
- ) );
-
- $updater->addExtensionUpdate( array(
- 'addIndex',
- 'contest_challenges',
- 'challenge_title',
- dirname( __FILE__ ) . '/sql/IndexChallengeTitle.sql',
- true
- ) );
-
- $updater->addExtensionUpdate( array(
- 'addIndex',
- 'contest_comments',
- 'comment_time',
- dirname( __FILE__ ) . '/sql/IndexCommentTime.sql',
- true
- ) );
-
- $updater->addExtensionUpdate( array(
- 'addIndex',
- 'contest_contestants',
- 'contestant_interests',
- dirname( __FILE__ ) .
'/sql/IndexContestantInterests.sql',
- true
- ) );
-
- $updater->addExtensionUpdate( array(
- 'addIndex',
- 'contest_contestants',
- 'contestant_rating',
- dirname( __FILE__ ) . '/sql/IndexContestantRating.sql',
- true
- ) );
-
- $updater->addExtensionUpdate( array(
- 'addIndex',
- 'contests',
- 'contest_status',
- dirname( __FILE__ ) . '/sql/IndexContestStatus.sql',
- true
- ) );
-
- $updater->addExtensionUpdate( array(
- 'addIndex',
- 'contest_votes',
- 'vote_contestant_id',
- dirname( __FILE__ ) . '/sql/IndexVoteContestantId.sql',
- true
- ) );
-
- $updater->addExtensionUpdate( array(
- 'addIndex',
- 'contest_votes',
- 'vote_contestant_user',
- dirname( __FILE__ ) .
'/sql/IndexVoteContestantUser.sql',
- true
- ) );
-
- $updater->addExtensionUpdate( array(
- 'addIndex',
- 'contest_votes',
- 'vote_user_id',
- dirname( __FILE__ ) . '/sql/IndexVoteUserId.sql',
- true
- ) );
-
- $updater->addExtensionUpdate( array(
'addField',
'contests',
'contest_signup_email',
Modified: trunk/extensions/Contest/Contest.sql
===================================================================
--- trunk/extensions/Contest/Contest.sql 2011-10-11 18:39:09 UTC (rev
99529)
+++ trunk/extensions/Contest/Contest.sql 2011-10-11 18:40:27 UTC (rev
99530)
@@ -18,6 +18,8 @@
contest_submission_count SMALLINT unsigned NOT NULL-- Amount of
submissions made to the contest
) /*$wgDBTableOptions*/;
+CREATE UNIQUE INDEX /*i*/contest_name ON /*_*/contests (contest_name);
+CREATE INDEX /*i*/contest_status ON /*_*/contests (contest_status,
contest_end);
-- Contestants
CREATE TABLE IF NOT EXISTS /*_*/contest_contestants (
@@ -43,6 +45,9 @@
contestant_rating_count SMALLINT unsigned NOT NULL, -- The amount of
ratings
contestant_comments SMALLINT unsigned NOT NULL -- The amount of
comments
) /*$wgDBTableOptions*/;
+CREATE INDEX /*i*/contestant_interests ON /*_*/contest_contestants
(contestant_challenge_id, contestant_wmf, contestant_volunteer);
+CREATE INDEX /*i*/contestant_rating ON /*_*/contest_contestants
(contestant_challenge_id, contestant_rating, contestant_rating_count);
+CREATE UNIQUE INDEX /*i*/contestant_user_contest ON /*_*/contest_contestants
(contestant_contest_id, contestant_user_id);
-- Challenges
CREATE TABLE IF NOT EXISTS /*_*/contest_challenges (
@@ -53,6 +58,8 @@
challenge_title VARCHAR(255) NOT NULL, -- Title of the
challenge
challenge_oneline TEXT NOT NULL -- One line
description of the challenge
) /*$wgDBTableOptions*/;
+CREATE INDEX /*i*/challenge_contest_id ON /*_*/contest_challenges
(challenge_contest_id);
+CREATE UNIQUE INDEX /*i*/challenge_title ON /*_*/contest_challenges
(challenge_title);
-- Judge votes
CREATE TABLE IF NOT EXISTS /*_*/contest_votes (
@@ -62,6 +69,9 @@
vote_value SMALLINT NOT NULL -- The value of
the vote
) /*$wgDBTableOptions*/;
+CREATE INDEX /*i*/vote_contestant_id ON /*_*/contest_votes
(vote_contestant_id);
+CREATE UNIQUE INDEX /*i*/vote_contestant_user ON /*_*/contest_votes
(vote_contestant_id, vote_user_id);
+CREATE INDEX /*i*/vote_user_id ON /*_*/contest_votes (vote_user_id);
-- Judge comments
CREATE TABLE IF NOT EXISTS /*_*/contest_comments (
@@ -71,4 +81,5 @@
comment_text TEXT NOT NULL, -- The comment
text
comment_time varbinary(14) NOT NULL default '' -- The
time at which the comment was made
-) /*$wgDBTableOptions*/;
\ No newline at end of file
+) /*$wgDBTableOptions*/;
+CREATE INDEX /*i*/comment_time ON /*_*/contest_comments
(comment_contestant_id, comment_time);
\ No newline at end of file
Deleted: trunk/extensions/Contest/sql/IndexChallengeContestId.sql
===================================================================
--- trunk/extensions/Contest/sql/IndexChallengeContestId.sql 2011-10-11
18:39:09 UTC (rev 99529)
+++ trunk/extensions/Contest/sql/IndexChallengeContestId.sql 2011-10-11
18:40:27 UTC (rev 99530)
@@ -1 +0,0 @@
-CREATE INDEX /*i*/challenge_contest_id ON /*_*/contest_challenges
(challenge_contest_id);
\ No newline at end of file
Deleted: trunk/extensions/Contest/sql/IndexChallengeTitle.sql
===================================================================
--- trunk/extensions/Contest/sql/IndexChallengeTitle.sql 2011-10-11
18:39:09 UTC (rev 99529)
+++ trunk/extensions/Contest/sql/IndexChallengeTitle.sql 2011-10-11
18:40:27 UTC (rev 99530)
@@ -1 +0,0 @@
-CREATE UNIQUE INDEX /*i*/challenge_title ON /*_*/contest_challenges
(challenge_title);
\ No newline at end of file
Deleted: trunk/extensions/Contest/sql/IndexCommentTime.sql
===================================================================
--- trunk/extensions/Contest/sql/IndexCommentTime.sql 2011-10-11 18:39:09 UTC
(rev 99529)
+++ trunk/extensions/Contest/sql/IndexCommentTime.sql 2011-10-11 18:40:27 UTC
(rev 99530)
@@ -1 +0,0 @@
-CREATE INDEX /*i*/comment_time ON /*_*/contest_comments
(comment_contestant_id, comment_time);
\ No newline at end of file
Deleted: trunk/extensions/Contest/sql/IndexContestName.sql
===================================================================
--- trunk/extensions/Contest/sql/IndexContestName.sql 2011-10-11 18:39:09 UTC
(rev 99529)
+++ trunk/extensions/Contest/sql/IndexContestName.sql 2011-10-11 18:40:27 UTC
(rev 99530)
@@ -1 +0,0 @@
-CREATE UNIQUE INDEX /*i*/contest_name ON /*_*/contests (contest_name);
\ No newline at end of file
Deleted: trunk/extensions/Contest/sql/IndexContestStatus.sql
===================================================================
--- trunk/extensions/Contest/sql/IndexContestStatus.sql 2011-10-11 18:39:09 UTC
(rev 99529)
+++ trunk/extensions/Contest/sql/IndexContestStatus.sql 2011-10-11 18:40:27 UTC
(rev 99530)
@@ -1 +0,0 @@
-CREATE INDEX /*i*/contest_status ON /*_*/contests (contest_status,
contest_end);
\ No newline at end of file
Deleted: trunk/extensions/Contest/sql/IndexContestantInterests.sql
===================================================================
--- trunk/extensions/Contest/sql/IndexContestantInterests.sql 2011-10-11
18:39:09 UTC (rev 99529)
+++ trunk/extensions/Contest/sql/IndexContestantInterests.sql 2011-10-11
18:40:27 UTC (rev 99530)
@@ -1 +0,0 @@
-CREATE INDEX /*i*/contestant_interests ON /*_*/contest_contestants
(contestant_challenge_id, contestant_wmf, contestant_volunteer);
\ No newline at end of file
Deleted: trunk/extensions/Contest/sql/IndexContestantRating.sql
===================================================================
--- trunk/extensions/Contest/sql/IndexContestantRating.sql 2011-10-11
18:39:09 UTC (rev 99529)
+++ trunk/extensions/Contest/sql/IndexContestantRating.sql 2011-10-11
18:40:27 UTC (rev 99530)
@@ -1 +0,0 @@
-CREATE INDEX /*i*/contestant_rating ON /*_*/contest_contestants
(contestant_challenge_id, contestant_rating, contestant_rating_count);
\ No newline at end of file
Deleted: trunk/extensions/Contest/sql/IndexContestantUserContest.sql
===================================================================
--- trunk/extensions/Contest/sql/IndexContestantUserContest.sql 2011-10-11
18:39:09 UTC (rev 99529)
+++ trunk/extensions/Contest/sql/IndexContestantUserContest.sql 2011-10-11
18:40:27 UTC (rev 99530)
@@ -1 +0,0 @@
-CREATE UNIQUE INDEX /*i*/contestant_user_contest ON /*_*/contest_contestants
(contestant_contest_id, contestant_user_id);
\ No newline at end of file
Deleted: trunk/extensions/Contest/sql/IndexVoteContestantId.sql
===================================================================
--- trunk/extensions/Contest/sql/IndexVoteContestantId.sql 2011-10-11
18:39:09 UTC (rev 99529)
+++ trunk/extensions/Contest/sql/IndexVoteContestantId.sql 2011-10-11
18:40:27 UTC (rev 99530)
@@ -1 +0,0 @@
-CREATE INDEX /*i*/vote_contestant_id ON /*_*/contest_votes
(vote_contestant_id);
\ No newline at end of file
Deleted: trunk/extensions/Contest/sql/IndexVoteContestantUser.sql
===================================================================
--- trunk/extensions/Contest/sql/IndexVoteContestantUser.sql 2011-10-11
18:39:09 UTC (rev 99529)
+++ trunk/extensions/Contest/sql/IndexVoteContestantUser.sql 2011-10-11
18:40:27 UTC (rev 99530)
@@ -1 +0,0 @@
-CREATE UNIQUE INDEX /*i*/vote_contestant_user ON /*_*/contest_votes
(vote_contestant_id, vote_user_id);
\ No newline at end of file
Deleted: trunk/extensions/Contest/sql/IndexVoteUserId.sql
===================================================================
--- trunk/extensions/Contest/sql/IndexVoteUserId.sql 2011-10-11 18:39:09 UTC
(rev 99529)
+++ trunk/extensions/Contest/sql/IndexVoteUserId.sql 2011-10-11 18:40:27 UTC
(rev 99530)
@@ -1 +0,0 @@
-CREATE INDEX /*i*/vote_user_id ON /*_*/contest_votes (vote_user_id);
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
