Merge "Set default to 1 recent contributor instead of -1"

diff --git a/maintenance/mssql/tables.sql b/maintenance/mssql/tables.sql
index 3babb39..41a2ef9 100644 (file)
--- 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 fc3c696..fefc31c 100644 (file)
--- 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 e19c447..9ded079 100644 (file)
--- 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 8f59690..38fef45 100644 (file)
--- 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 b90b1ad..6d960e1 100644 (file)
--- a/tests/phpunit/includes/db/DatabaseSqliteTest.php
+++ b/tests/phpunit/includes/db/DatabaseSqliteTest.php
@@ -311,6 +311,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:' );