Merge "Check minimum database server version when running update.php"

diff --combined includes/installer/DatabaseInstaller.php
index d4150c8,925d991..62acebf
--- 1/includes/installer/DatabaseInstaller.php
--- 2/includes/installer/DatabaseInstaller.php
+++ b/includes/installer/DatabaseInstaller.php
@@@ -41,6 -41,16 +41,16 @@@ abstract class DatabaseInstaller 
         */
        public $parent;
  
+       /**
+        * @var string Set by subclasses
+        */
+       public static $minimumVersion;
+ 
+       /**
+        * @var string Set by subclasses
+        */
+       protected static $notMiniumumVerisonMessage;
+ 
        /**
         * The database connection.
         *
@@@ -62,6 -72,23 +72,23 @@@
         */
        protected $globalNames = [];
  
+       /**
+        * Whether the provided version meets the necessary requirements for this type
+        *
+        * @param string $serverVersion Output of Database::getServerVersion()
+        * @return Status
+        * @since 1.30
+        */
+       public static function meetsMinimumRequirement( $serverVersion ) {
+               if ( version_compare( $serverVersion, static::$minimumVersion ) < 0 ) {
+                       return Status::newFatal(
+                               static::$notMiniumumVerisonMessage, static::$minimumVersion, $serverVersion
+                       );
+               }
+ 
+               return Status::newGood();
+       }
+ 
        /**
         * Return the internal name, e.g. 'mysql', or 'sqlite'.
         */
@@@ -697,7 -724,7 +724,7 @@@
                }
                $this->db->selectDB( $this->getVar( 'wgDBname' ) );
  
 -              if ( $this->db->selectRow( 'interwiki', '*', [], __METHOD__ ) ) {
 +              if ( $this->db->selectRow( 'interwiki', '1', [], __METHOD__ ) ) {
                        $status->warning( 'config-install-interwiki-exists' );
  
                        return $status;

diff --combined includes/installer/PostgresInstaller.php
index 2265ae3,129dbf8..cb1b47e
--- 1/includes/installer/PostgresInstaller.php
--- 2/includes/installer/PostgresInstaller.php
+++ b/includes/installer/PostgresInstaller.php
@@@ -46,7 -46,8 +46,8 @@@ class PostgresInstaller extends Databas
                '_InstallUser' => 'postgres',
        ];
  
-       public $minimumVersion = '8.3';
+       public static $minimumVersion = '8.3';
+       protected static $notMiniumumVerisonMessage = 'config-postgres-old';
        public $maxRoleSearchDepth = 5;
  
        protected $pgConns = [];
@@@ -124,8 -125,9 +125,9 @@@
  
                // Check version
                $version = $conn->getServerVersion();
-               if ( version_compare( $version, $this->minimumVersion ) < 0 ) {
-                       return Status::newFatal( 'config-postgres-old', $this->minimumVersion, $version );
+               $status = static::meetsMinimumRequirement( $conn->getServerVersion() );
+               if ( !$status->isOK() ) {
+                       return $status;
                }
  
                $this->setVar( 'wgDBuser', $this->getVar( '_InstallUser' ) );
@@@ -637,7 -639,7 +639,7 @@@
  
        public function setupPLpgSQL() {
                // Connect as the install user, since it owns the database and so is
 -              // the user that needs to run "CREATE LANGAUGE"
 +              // the user that needs to run "CREATE LANGUAGE"
                $status = $this->getPgConnection( 'create-schema' );
                if ( !$status->isOK() ) {
                        return $status;

diff --combined maintenance/update.php
index 5e2947b,9f2fb92..ba66c76
--- 1/maintenance/update.php
--- 2/maintenance/update.php
+++ b/maintenance/update.php
@@@ -128,7 -128,7 +128,7 @@@ class UpdateMediaWiki extends Maintenan
                        $this->compatChecks();
                } else {
                        $this->output( "Skipping compatibility checks, proceed at your own risk (Ctrl+C to abort)\n" );
 -                      wfCountDown( 5 );
 +                      $this->countDown( 5 );
                }
  
                // Check external dependencies are up to date
@@@ -145,6 -145,16 +145,16 @@@
                # This will vomit up an error if there are permissions problems
                $db = $this->getDB( DB_MASTER );
  
+               # Check to see whether the database server meets the minimum requirements
+               /** @var DatabaseInstaller $dbInstallerClass */
+               $dbInstallerClass = Installer::getDBInstallerClass( $db->getType() );
+               $status = $dbInstallerClass::meetsMinimumRequirement( $db->getServerVersion() );
+               if ( !$status->isOK() ) {
+                       // This might output some wikitext like <strong> but it should be comprehensible
+                       $text = $status->getWikiText();
+                       $this->error( $text, 1 );
+               }
+ 
                $this->output( "Going to run database updates for " . wfWikiID() . "\n" );
                if ( $db->getType() === 'sqlite' ) {
                        /** @var IMaintainableDatabase|DatabaseSqlite $db */
@@@ -155,7 -165,7 +165,7 @@@
                if ( !$this->hasOption( 'quick' ) ) {
                        $this->output( "Abort with control-c in the next five seconds "
                                . "(skip this countdown with --quick) ... " );
 -                      wfCountDown( 5 );
 +                      $this->countDown( 5 );
                }
  
                $time1 = microtime( true );