From b67f40e5b01af569794eba26da79497329590d36 Mon Sep 17 00:00:00 2001 From: MZMcBride Date: Wed, 15 Mar 2017 21:10:09 -0400 Subject: [PATCH] Set default to 1 recent contributor instead of -1 Bug: T56888 Change-Id: I06bd0e5959d1ff561d71163bd5ce26f28f73981c --- maintenance/mssql/tables.sql | 2 +- maintenance/oracle/tables.sql | 2 +- maintenance/postgres/tables.sql | 2 +- maintenance/tables.sql | 2 +- tests/phpunit/includes/db/DatabaseSqliteTest.php | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/maintenance/mssql/tables.sql b/maintenance/mssql/tables.sql index 3babb393fb..41a2ef9dce 100644 --- a/maintenance/mssql/tables.sql +++ b/maintenance/mssql/tables.sql @@ -469,7 +469,7 @@ CREATE TABLE /*_*/site_stats ( ss_users bigint default '-1', -- Number of users that still edit - ss_active_users bigint default '-1', + ss_active_users bigint default '1', -- Number of images, equivalent to SELECT COUNT(*) FROM image ss_images int default 0 diff --git a/maintenance/oracle/tables.sql b/maintenance/oracle/tables.sql index fc3c696a6c..fefc31c5a2 100644 --- a/maintenance/oracle/tables.sql +++ b/maintenance/oracle/tables.sql @@ -255,7 +255,7 @@ CREATE TABLE &mw_prefix.site_stats ( ss_good_articles NUMBER DEFAULT 0, ss_total_pages NUMBER DEFAULT -1, ss_users NUMBER DEFAULT -1, - ss_active_users NUMBER DEFAULT -1, + ss_active_users NUMBER DEFAULT 1, ss_images NUMBER DEFAULT 0 ); CREATE UNIQUE INDEX &mw_prefix.site_stats_u01 ON &mw_prefix.site_stats (ss_row_id); diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql index e19c447a65..9ded0794f4 100644 --- a/maintenance/postgres/tables.sql +++ b/maintenance/postgres/tables.sql @@ -283,7 +283,7 @@ CREATE TABLE site_stats ( ss_good_articles INTEGER DEFAULT 0, ss_total_pages INTEGER DEFAULT -1, ss_users INTEGER DEFAULT -1, - ss_active_users INTEGER DEFAULT -1, + ss_active_users INTEGER DEFAULT 1, ss_admins INTEGER DEFAULT -1, ss_images INTEGER DEFAULT 0 ); diff --git a/maintenance/tables.sql b/maintenance/tables.sql index 8f596904ad..38fef45f1b 100644 --- a/maintenance/tables.sql +++ b/maintenance/tables.sql @@ -758,7 +758,7 @@ CREATE TABLE /*_*/site_stats ( ss_users bigint default '-1', -- Number of users that still edit - ss_active_users bigint default '-1', + ss_active_users bigint default '1', -- Number of images, equivalent to SELECT COUNT(*) FROM image ss_images int default 0 diff --git a/tests/phpunit/includes/db/DatabaseSqliteTest.php b/tests/phpunit/includes/db/DatabaseSqliteTest.php index 10bf028591..d7fe022b1b 100644 --- a/tests/phpunit/includes/db/DatabaseSqliteTest.php +++ b/tests/phpunit/includes/db/DatabaseSqliteTest.php @@ -309,6 +309,7 @@ class DatabaseSqliteTest extends MediaWikiTestCase { // Mismatches for these columns we can safely ignore $ignoredColumns = [ 'user_newtalk.user_last_timestamp', // r84185 + 'site_stats.ss_active_users', // T56888 ]; $currentDB = DatabaseSqlite::newStandaloneInstance( ':memory:' ); -- 2.20.1