rdbms: Restore debug toolbar "Queries" feature

[lhc/web/wiklou.git] / includes / db / MWLBFactory.php

diff --git a/includes/db/MWLBFactory.php b/includes/db/MWLBFactory.php
index 63b320e..b4e782b 100644 (file)
--- a/includes/db/MWLBFactory.php
+++ b/includes/db/MWLBFactory.php
@@ -35,12 +35,10 @@ abstract class MWLBFactory {
        private static $loggedDeprecations = [];
 
        /**
-        * TODO Make this a const when HHVM support is dropped (T192166)
-        *
         * @var array
         * @since 1.34
         */
-       public static $applyDefaultConfigOptions = [
+       public const APPLY_DEFAULT_CONFIG_OPTIONS = [
                'DBcompress',
                'DBDefaultGroup',
                'DBmwschema',
@@ -79,7 +77,7 @@ abstract class MWLBFactory {
                BagOStuff $mainStash,
                WANObjectCache $wanCache
        ) {
-               $options->assertRequiredOptions( self::$applyDefaultConfigOptions );
+               $options->assertRequiredOptions( self::APPLY_DEFAULT_CONFIG_OPTIONS );
 
                global $wgCommandLineMode;
 
@@ -198,13 +196,14 @@ abstract class MWLBFactory {
                        $server += [ 'schema' => $options->get( 'DBmwschema' ) ];
                }
 
-               $flags = DBO_DEFAULT;
-               $flags |= $options->get( 'DebugDumpSql' ) ? DBO_DEBUG : 0;
-               $flags |= $options->get( 'DebugLogFile' ) ? DBO_DEBUG : 0;
+               $flags = $server['flags'] ?? DBO_DEFAULT;
+               if ( $options->get( 'DebugDumpSql' ) || $options->get( 'DebugLogFile' ) ) {
+                       $flags |= DBO_DEBUG;
+               }
+               $server['flags'] = $flags;
 
                $server += [
                        'tablePrefix' => $options->get( 'DBprefix' ),
-                       'flags' => $flags,
                        'sqlMode' => $options->get( 'SQLMode' ),
                ];