From 962fd01daf1ba1e72c7d0fc528141d5b293c49fc Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Thu, 15 Mar 2018 14:29:29 -0700 Subject: [PATCH] rdbms: small code cleanups to Database Change-Id: I831b4ea1ced425b5008f3dd2802e16bb898f4b47 --- includes/libs/rdbms/database/Database.php | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php index 53cf55caf1..97ea26645c 100644 --- a/includes/libs/rdbms/database/Database.php +++ b/includes/libs/rdbms/database/Database.php @@ -1590,17 +1590,12 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware public function estimateRowCount( $table, $vars = '*', $conds = '', $fname = __METHOD__, $options = [], $join_conds = [] ) { - $rows = 0; $res = $this->select( $table, [ 'rowcount' => 'COUNT(*)' ], $conds, $fname, $options, $join_conds ); + $row = $res ? $this->fetchRow( $res ) : []; - if ( $res ) { - $row = $this->fetchRow( $res ); - $rows = ( isset( $row['rowcount'] ) ) ? (int)$row['rowcount'] : 0; - } - - return $rows; + return isset( $row['rowcount'] ) ? (int)$row['rowcount'] : 0; } public function selectRowCount( @@ -2204,9 +2199,9 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware if ( is_array( $table ) ) { // A parenthesized group if ( count( $table ) > 1 ) { - $joinedTable = '(' - . $this->tableNamesWithIndexClauseOrJOIN( $table, $use_index, $ignore_index, $join_conds ) - . ')'; + $joinedTable = '(' . + $this->tableNamesWithIndexClauseOrJOIN( + $table, $use_index, $ignore_index, $join_conds ) . ')'; } else { // Degenerate case $innerTable = reset( $table ); @@ -2364,7 +2359,8 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware } } - return ' LIKE ' . $this->addQuotes( $s ) . ' ESCAPE ' . $this->addQuotes( $escapeChar ) . ' '; + return ' LIKE ' . + $this->addQuotes( $s ) . ' ESCAPE ' . $this->addQuotes( $escapeChar ) . ' '; } public function anyChar() { -- 2.20.1