http://www.mediawiki.org/wiki/Special:Code/MediaWiki/68536
Revision: 68536
Author: demon
Date: 2010-06-25 00:39:04 +0000 (Fri, 25 Jun 2010)
Log Message:
-----------
Move flaggedrevs_stats creation to actual patch files rather than this DIY stuff
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
trunk/extensions/FlaggedRevs/FlaggedRevs.sql
trunk/extensions/FlaggedRevs/maintenance/updateStats.inc
Added Paths:
-----------
trunk/extensions/FlaggedRevs/archives/patch-flaggedrevs_stats.sql
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php 2010-06-25 00:08:01 UTC
(rev 68535)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php 2010-06-25 00:39:04 UTC
(rev 68536)
@@ -2203,6 +2203,8 @@
"$base/archives/patch-fpc_level.sql" );
$wgExtNewTables[] = array( 'flaggedpage_pending',
"$base/archives/patch-flaggedpage_pending.sql"
);
+ $wgExtNewTables[] = array( 'flaggedrevs_stats',
+ "$base/archives/patch-flaggedrevs_stats.sql" );
} elseif ( $wgDBtype == 'postgres' ) {
// Initial install tables (current schema)
$wgExtNewTables[] = array( 'flaggedrevs',
"$base/FlaggedRevs.pg.sql" );
Modified: trunk/extensions/FlaggedRevs/FlaggedRevs.sql
===================================================================
--- trunk/extensions/FlaggedRevs/FlaggedRevs.sql 2010-06-25 00:08:01 UTC
(rev 68535)
+++ trunk/extensions/FlaggedRevs/FlaggedRevs.sql 2010-06-25 00:39:04 UTC
(rev 68536)
@@ -136,3 +136,17 @@
frp_user_id integer unsigned NOT NULL PRIMARY KEY,
frp_user_params mediumblob NOT NULL
) /*$wgDBTableOptions*/;
+
+CREATE TABLE /*_*/flaggedrevs_stats (
+ namespace int unsigned NOT NULL DEFAULT 0 PRIMARY KEY,
+ total int unsigend NOT NULL DEFAULT 0,
+ reviewed int unsigned NOT NULL DEFAULT 0,
+ synced int unsigned NOT NULL DEFAULT 0
+) /*$wgDBTableOptions*/;
+
+CREATE TABLE /*_*/flaggedrevs_stats2 (
+ stat_id int unsigned NOT NULL DEFAULT 1 PRIMARY KEY,
+ ave_review_time int unsigned NOT NULL DEFAULT 0,
+ med_review_time int unsigned NOT NULL DEFAULT 0,
+ ave_pending_time int unsigned NOT NULL DEFAULT 0
+) /*$wgDBTableOptions*/;
Added: trunk/extensions/FlaggedRevs/archives/patch-flaggedrevs_stats.sql
===================================================================
--- trunk/extensions/FlaggedRevs/archives/patch-flaggedrevs_stats.sql
(rev 0)
+++ trunk/extensions/FlaggedRevs/archives/patch-flaggedrevs_stats.sql
2010-06-25 00:39:04 UTC (rev 68536)
@@ -0,0 +1,14 @@
+-- Various statistics about the reviewed namespaces
+CREATE TABLE /*_*/flaggedrevs_stats (
+ namespace int unsigned NOT NULL DEFAULT 0 PRIMARY KEY,
+ total int unsigend NOT NULL DEFAULT 0,
+ reviewed int unsigned NOT NULL DEFAULT 0,
+ synced int unsigned NOT NULL DEFAULT 0
+) /*$wgDBTableOptions*/;
+
+CREATE TABLE /*_*/flaggedrevs_stats2 (
+ stat_id int unsigned NOT NULL DEFAULT 1 PRIMARY KEY,
+ ave_review_time int unsigned NOT NULL DEFAULT 0,
+ med_review_time int unsigned NOT NULL DEFAULT 0,
+ ave_pending_time int unsigned NOT NULL DEFAULT 0
+) /*$wgDBTableOptions*/;
Property changes on:
trunk/extensions/FlaggedRevs/archives/patch-flaggedrevs_stats.sql
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/extensions/FlaggedRevs/maintenance/updateStats.inc
===================================================================
--- trunk/extensions/FlaggedRevs/maintenance/updateStats.inc 2010-06-25
00:08:01 UTC (rev 68535)
+++ trunk/extensions/FlaggedRevs/maintenance/updateStats.inc 2010-06-25
00:39:04 UTC (rev 68536)
@@ -224,6 +224,15 @@
$dbCache->set( $key, $data, 30*24*3600 );
// Save the data
$dbw = wfGetDB( DB_MASTER );
+
+ // Make sure the master has flaggedrevs_stats and _stats2
+ if( !$dbw->tableExists( 'flaggedrevs_stats' ) ||
+ !$dbw->tableExists( 'flaggedrevs_stats2' ) )
+ {
+ print( "Need to run update.php to create flaggedrevs_stats and
flaggedrevs_stats2. Stopping." );
+ die( 1 );
+ }
+
$dbw->begin();
// Create small stats tables if not present
$flaggedrevs_stats = $dbr->tableName('flaggedrevs_stats');
@@ -268,27 +277,3 @@
$dbCache->delete( $keySQL );
print( "done updating!\n" );
}
-
-// Per-Namespace stats
-function createFlaggedRevsStatsTable( $dbw, $flaggedrevs_stats ) {
- $dbw->query(
- "CREATE TABLE $flaggedrevs_stats (
- namespace INTEGER UNSIGNED NOT NULL DEFAULT 0 PRIMARY
KEY,
- total INTEGER UNSIGNED NOT NULL DEFAULT 0,
- reviewed INTEGER UNSIGNED NOT NULL DEFAULT 0,
- synced INTEGER UNSIGNED NOT NULL DEFAULT 0
- );"
- );
-}
-
-// General stats
-function createFlaggedRevsStatsTable2( $dbw, $flaggedrevs_stats2 ) {
- $dbw->query(
- "CREATE TABLE $flaggedrevs_stats2 (
- stat_id INTEGER UNSIGNED NOT NULL DEFAULT 1
PRIMARY KEY,
- ave_review_time INTEGER UNSIGNED NOT NULL DEFAULT 0,
- med_review_time INTEGER UNSIGNED NOT NULL DEFAULT 0,
- ave_pending_time INTEGER UNSIGNED NOT NULL DEFAULT 0
- );"
- );
-}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
