X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FrefreshImageMetadata.php;h=41da6b46e405517a5b887fe2b97fdbcd5ba7f2de;hb=052c6c9aedfce9b5470f5709da14268bc7c8bc38;hp=372c352846c61f5e2f1a024ab945636b9364a6cc;hpb=9aba586d3b758719d9aa08b236a9de93956b6a96;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/refreshImageMetadata.php b/maintenance/refreshImageMetadata.php
index 372c352846..41da6b46e4 100644
--- a/maintenance/refreshImageMetadata.php
+++ b/maintenance/refreshImageMetadata.php
@@ -29,6 +29,9 @@
 
 require_once __DIR__ . '/Maintenance.php';
 
+use Wikimedia\Rdbms\IDatabase;
+use Wikimedia\Rdbms\IMaintainableDatabase;
+
 /**
  * Maintenance script to refresh image metadata fields.
  *
@@ -37,7 +40,7 @@ require_once __DIR__ . '/Maintenance.php';
 class RefreshImageMetadata extends Maintenance {
 
 	/**
-	 * @var Database
+	 * @var IMaintainableDatabase
 	 */
 	protected $dbw;
 
@@ -124,7 +127,7 @@ class RefreshImageMetadata extends Maintenance {
 		do {
 			$res = $dbw->select(
 				'image',
-				'*',
+				LocalFile::selectFields(),
 				array_merge( $conds, $conds2 ),
 				__METHOD__,
 				$options
@@ -132,10 +135,8 @@ class RefreshImageMetadata extends Maintenance {
 
 			if ( $res->numRows() > 0 ) {
 				$row1 = $res->current();
-				$this->output( "Processing next {$this->mBatchSize} rows starting with {$row1->img_name}.\n" );
+				$this->output( "Processing next {$res->numRows()} row(s) starting with {$row1->img_name}.\n" );
 				$res->rewind();
-			} else {
-				$this->error( "No images to process.", 4 );
 			}
 
 			foreach ( $res as $row ) {
@@ -205,7 +206,7 @@ class RefreshImageMetadata extends Maintenance {
 	}
 
 	/**
-	 * @param Database $dbw
+	 * @param IDatabase $dbw
 	 * @return array
 	 */
 	function getConditions( $dbw ) {