From c57cdf427659744831d458ea7c18e69ad9ea43cc Mon Sep 17 00:00:00 2001 From: Amir Sarabadani Date: Tue, 1 Aug 2023 18:34:16 +0200 Subject: Migrate last batch of simple Database::select* calls to SQB Done semi-automatically via a parser written on top of ANTLR4 Bug: T311866 Change-Id: Ib71d6810e480d7176726082347b569e346557de7 --- includes/externalstore/ExternalStoreDB.php | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'includes/externalstore') diff --git a/includes/externalstore/ExternalStoreDB.php b/includes/externalstore/ExternalStoreDB.php index 7606236b140d..e5b0d1edea42 100644 --- a/includes/externalstore/ExternalStoreDB.php +++ b/includes/externalstore/ExternalStoreDB.php @@ -298,24 +298,22 @@ class ExternalStoreDB extends ExternalStoreMedium { $this->logger->debug( __METHOD__ . ": cache miss on $cacheID" ); $dbr = $this->getReplica( $cluster ); - $ret = $dbr->selectField( - $this->getTable( $dbr, $cluster ), - 'blob_text', - [ 'blob_id' => $id ], - __METHOD__ - ); + $ret = $dbr->newSelectQueryBuilder() + ->select( 'blob_text' ) + ->from( $this->getTable( $dbr, $cluster ) ) + ->where( [ 'blob_id' => $id ] ) + ->caller( __METHOD__ )->fetchField(); if ( $ret === false ) { // Try the primary DB $this->logger->warning( __METHOD__ . ": primary DB fallback on $cacheID" ); $trxProfiler = $this->lbFactory->getTransactionProfiler(); $scope = $trxProfiler->silenceForScope( $trxProfiler::EXPECTATION_REPLICAS_ONLY ); $dbw = $this->getPrimary( $cluster ); - $ret = $dbw->selectField( - $this->getTable( $dbw, $cluster ), - 'blob_text', - [ 'blob_id' => $id ], - __METHOD__ - ); + $ret = $dbw->newSelectQueryBuilder() + ->select( 'blob_text' ) + ->from( $this->getTable( $dbw, $cluster ) ) + ->where( [ 'blob_id' => $id ] ) + ->caller( __METHOD__ )->fetchField(); ScopedCallback::consume( $scope ); if ( $ret === false ) { $this->logger->warning( __METHOD__ . ": primary DB failed to find $cacheID" ); -- cgit v1.2.3