From: Erik Bernhardson Date: Mon, 18 Jul 2016 17:26:03 +0000 (-0700) Subject: Update BatchRowIterator constructor to allow multiple tables X-Git-Tag: 1.31.0-rc.0~6352^2 X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=90d2135893ebca422b221b0b01342b7c39534816;p=lhc%2Fweb%2Fwiklou.git Update BatchRowIterator constructor to allow multiple tables This already supported multiple tables, but the annotations claimed it didn't. This $table value gets passed on directly to IDatabase::select which takes a string or array, so mark it as such here as well. Change-Id: I28fa61429544e592f90c0855ea59279af897283f --- diff --git a/includes/utils/BatchRowIterator.php b/includes/utils/BatchRowIterator.php index 419ee4730d..c7bd395b5d 100644 --- a/includes/utils/BatchRowIterator.php +++ b/includes/utils/BatchRowIterator.php @@ -31,7 +31,7 @@ class BatchRowIterator implements RecursiveIterator { protected $db; /** - * @var string $table The name of the table to read from + * @var string|array $table The name or names of the table to read from */ protected $table; @@ -79,7 +79,7 @@ class BatchRowIterator implements RecursiveIterator { /** * @param IDatabase $db The database to read from - * @param string $table The name of the table to read from + * @param string|array $table The name or names of the table to read from * @param string|array $primaryKey The name or names of the primary key columns * @param integer $batchSize The number of rows to fetch per iteration * @throws MWException