Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PLATFORM-9062 | Replace use of PRIMARY_DB connection in CargoUtils, CargoAttach, CargoDeclare and CargoPageValues #20

Merged
merged 1 commit into from
Feb 28, 2024
Merged

PLATFORM-9062 | Replace use of PRIMARY_DB connection in CargoUtils, CargoAttach, CargoDeclare and CargoPageValues #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion includes/CargoRecreateDataAction.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

use MediaWiki\MediaWikiServices;
use MediaWiki\Permissions\PermissionManager;

/**
* Handles the 'recreatedata' action.
Expand Down Expand Up @@ -58,7 +59,7 @@ public static function displayTab( $obj, &$links ) {

$user = $obj->getUser();
$permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
if ( !$permissionManager->userCan( 'recreatecargodata', $user, $title ) ) {
if ( !$permissionManager->userCan( 'recreatecargodata', $user, $title, PermissionManager::RIGOR_QUICK ) ) {
return true;
}

Expand Down
3 changes: 1 addition & 2 deletions includes/CargoUtils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,8 +620,7 @@ public static function tableFullyExists( $tableName ) {
return false;
}

$cdb = self::getDB();
return $cdb->tableExists( $tableName );
return CargoServices::getCargoConnectionProvider()->getConnection( DB_REPLICA )->tableExists( $tableName );
}

public static function fieldTypeToSQLType( $fieldType, $dbType, $size = null ) {
Expand Down
5 changes: 4 additions & 1 deletion includes/api/CargoRecreateTablesAPI.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ protected function getDescription() {

protected function getExamples() {
return [
'api.php?action=cargorecreatetables&template=City'
'api.php?action=cargorecreatetables&template=City',
];
}

Expand All @@ -76,4 +76,7 @@ public function needsToken() {
return 'csrf';
}

public function isWriteMode() {
return true;
}
}
9 changes: 7 additions & 2 deletions includes/parserfunctions/CargoAttach.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<?php

use MediaWiki\MediaWikiServices;

/**
* Class for the #cargo_attach parser function.
*
Expand Down Expand Up @@ -41,8 +44,10 @@ public static function run( Parser $parser ) {
return CargoUtils::formatError( wfMessage( "cargo-notable" )->parse() );
}

$dbw = wfGetDB( DB_MASTER );
$res = $dbw->select( 'cargo_tables', 'COUNT(*) AS total', [ 'main_table' => $tableName ] );
$res = MediaWikiServices::getInstance()
->getDBLoadBalancer()
->getConnection( DB_REPLICA )
->select( 'cargo_tables', 'COUNT(*) AS total', [ 'main_table' => $tableName ] );
$row = $res->fetchRow();
if ( !empty( $row ) && $row['total'] == 0 ) {
return CargoUtils::formatError( "Error: The specified table, \"$tableName\", does not exist." );
Expand Down
4 changes: 1 addition & 3 deletions includes/parserfunctions/CargoDeclare.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,7 @@ public static function run( Parser $parser ) {
}

// Validate table name.

$cdb = CargoUtils::getDB();
$cdb = CargoServices::getCargoConnectionProvider()->getConnection( DB_REPLICA );

foreach ( $parentTables as $extraParams ) {
$parentTableName = $extraParams['Name'];
Expand Down Expand Up @@ -359,7 +358,6 @@ public static function run( Parser $parser ) {
// exists already - otherwise, explain that it needs to be
// created.
$text = wfMessage( 'cargo-definestable', $tableName )->text();
$cdb = CargoUtils::getDB();
if ( $cdb->tableExists( $tableName ) ) {
$ct = SpecialPage::getTitleFor( 'CargoTables' );
$pageName = $ct->getPrefixedText() . "/$tableName";
Expand Down
5 changes: 2 additions & 3 deletions includes/specials/CargoPageValues.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,6 @@ private function getInfoForAllFields( $tableName ) {
}

public function getRowsForPageInTable( $tableName ) {
$cdb = CargoUtils::getDB();

$sqlQuery = new CargoSQLQuery();
$sqlQuery->mAliasedTableNames = [ $tableName => $tableName ];

Expand Down Expand Up @@ -197,7 +195,8 @@ public function getRowsForPageInTable( $tableName ) {
$sqlQuery->mOrigAliasedFieldNames = $aliasedFieldNames;
$sqlQuery->setDescriptionsAndTableNamesForFields();
$sqlQuery->handleDateFields();
$sqlQuery->mWhereStr = $cdb->addIdentifierQuotes( '_pageID' ) . " = " .
$sqlQuery->mWhereStr = CargoServices::getCargoConnectionProvider()->getConnection( DB_REPLICA )
->addIdentifierQuotes( '_pageID' ) . " = " .
$this->mTitle->getArticleID();

$queryResults = $sqlQuery->run();
Expand Down
14 changes: 7 additions & 7 deletions includes/specials/SpecialCargoRecreateData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function execute( $query = null ) {
$out->addModules( 'ext.cargo.recreatedata' );

$templateData = [];
$dbw = wfGetDB( DB_MASTER );
$dbr = MediaWikiServices::getInstance()->getDBLoadBalancer()->getConnection( DB_REPLICA );
if ( $this->mTemplateTitle === null ) {
if ( $this->mTableName == '_pageData' ) {
$conds = null;
Expand All @@ -75,18 +75,18 @@ public function execute( $query = null ) {
} else { // if ( $this->mTableName == '_ganttData' ) {
$conds = 'page_namespace = ' . FD_NS_GANTT;
}
$numTotalPages = $dbw->selectField( 'page', 'COUNT(*)', $conds );
$numTotalPages = $dbr->selectField( 'page', 'COUNT(*)', $conds );
} else {
$numTotalPages = null;
$templateData[] = [
'name' => $this->mTemplateTitle->getText(),
'numPages' => $this->getNumPagesThatCallTemplate( $dbw, $this->mTemplateTitle )
'numPages' => $this->getNumPagesThatCallTemplate( $dbr, $this->mTemplateTitle )
];
}

if ( $this->mIsDeclared ) {
// Get all attached templates.
$res = $dbw->select( 'page_props',
$res = $dbr->select( 'page_props',
[
'pp_page'
],
Expand All @@ -98,7 +98,7 @@ public function execute( $query = null ) {
foreach ( $res as $row ) {
$templateID = $row->pp_page;
$attachedTemplateTitle = Title::newFromID( $templateID );
$numPages = $this->getNumPagesThatCallTemplate( $dbw, $attachedTemplateTitle );
$numPages = $this->getNumPagesThatCallTemplate( $dbr, $attachedTemplateTitle );
$attachedTemplateName = $attachedTemplateTitle->getText();
$templateData[] = [
'name' => $attachedTemplateName,
Expand Down Expand Up @@ -156,7 +156,7 @@ public function execute( $query = null ) {
return true;
}

public function getNumPagesThatCallTemplate( IDatabase $dbw, LinkTarget $templateTitle ) {
public function getNumPagesThatCallTemplate( IDatabase $dbr, LinkTarget $templateTitle ) {
$conds = [ "tl_from=page_id" ];

// MW 1.38+ - use the normalized link target ID for fetching incoming links to this template.
Expand All @@ -170,7 +170,7 @@ public function getNumPagesThatCallTemplate( IDatabase $dbw, LinkTarget $templat
$conds['tl_title'] = $templateTitle->getDBkey();
}

$res = $dbw->select(
$res = $dbr->select(
[ 'page', 'templatelinks' ],
'COUNT(*) AS total',
$conds,
Expand Down
Loading