Merge "Revert "Log the reason why revision->getContent() returns null""

[lhc/web/wiklou.git] / maintenance / sql.php

diff --git a/maintenance/sql.php b/maintenance/sql.php
index 8e276e7..2c8bdb6 100644 (file)
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -40,6 +40,7 @@ class MwSql extends Maintenance {
                        'Takes a file name containing SQL as argument or runs interactively.' );
                $this->addOption( 'query',
                        'Run a single query instead of running interactively', false, true );
+               $this->addOption( 'json', 'Output the results as JSON instead of PHP objects' );
                $this->addOption( 'cluster', 'Use an external cluster by name', false, true );
                $this->addOption( 'wikidb',
                        'The database wiki ID to use if not the current one', false, true );
@@ -167,7 +168,7 @@ class MwSql extends Maintenance {
 
        /**
         * Print the results, callback for $db->sourceStream()
-        * @param ResultWrapper|bool $res The results object
+        * @param ResultWrapper|bool $res
         * @param IDatabase $db
         */
        public function sqlPrintResult( $res, $db ) {
@@ -175,9 +176,15 @@ class MwSql extends Maintenance {
                        // Do nothing
                        return;
                } elseif ( is_object( $res ) && $res->numRows() ) {
+                       $out = '';
                        foreach ( $res as $row ) {
-                               $this->output( print_r( $row, true ) );
+                               $out .= print_r( $row, true );
+                               $rows[] = $row;
                        }
+                       if ( $this->hasOption( 'json' ) ) {
+                               $out = json_encode( $rows, JSON_PRETTY_PRINT );
+                       }
+                       $this->output( $out . "\n" );
                } else {
                        $affected = $db->affectedRows();
                        $this->output( "Query OK, $affected row(s) affected\n" );
@@ -192,5 +199,5 @@ class MwSql extends Maintenance {
        }
 }
 
-$maintClass = "MwSql";
+$maintClass = MwSql::class;
 require_once RUN_MAINTENANCE_IF_MAIN;