wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-09-23 02:18:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use expression builder instead of raw sql

Browse source 
Change-Id: I0cb5fa07d63bc93089a4956097eee7a41dbc99e7
This commit is contained in:
Umherirrender 2024-07-21 22:59:23 +02:00
parent a0b8933a41
commit 2a932e598c
5 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extension.json
View file

@ -7,7 +7,7 @@
"descriptionmsg": "discussiontools-desc", "descriptionmsg": "discussiontools-desc",
"manifest_version": 2, "manifest_version": 2,
"requires": { "requires": {
"MediaWiki": ">= 1.42.0", "MediaWiki": ">= 1.43.0",
"extensions": { "extensions": {
"VisualEditor": "*", "VisualEditor": "*",
"Linter": "*" "Linter": "*"

6
includes/ThreadItemStore.php
View file

@ -87,6 +87,7 @@ class ThreadItemStore {
return []; return [];
} }
$dbr = $this->dbProvider->getReplicaDatabase();
$queryBuilder = $this->getIdsNamesBuilder() $queryBuilder = $this->getIdsNamesBuilder()
->caller( __METHOD__ ) ->caller( __METHOD__ )
->where( [ ->where( [
@ -94,7 +95,7 @@ class ThreadItemStore {
// Disallow querying for headings of sections that contain no comments. // Disallow querying for headings of sections that contain no comments.
// They all share the same name, so this would return a huge useless list on most wikis. // They all share the same name, so this would return a huge useless list on most wikis.
// (But we still store them, as we might need this data elsewhere.) // (But we still store them, as we might need this data elsewhere.)
"it_itemname != 'h-'", $dbr->expr( 'it_itemname', '!=', 'h-' ),
] ); ] );
if ( $limit !== null ) { if ( $limit !== null ) {
@ -141,10 +142,11 @@ class ThreadItemStore {
// It might scan a bunch of rows... // It might scan a bunch of rows...
// ->limit( 1 ); // ->limit( 1 );
$dbr = $this->dbProvider->getReplicaDatabase();
$queryBuilder $queryBuilder
->where( [ ->where( [
'it_itemname IN (' . $itemNameQueryBuilder->getSQL() . ')', 'it_itemname IN (' . $itemNameQueryBuilder->getSQL() . ')',
"it_itemname != 'h-'", $dbr->expr( 'it_itemname', '!=', 'h-' ),
] ); ] );
if ( $limit !== null ) { if ( $limit !== null ) {

2
includes/TopicSubscriptionsPager.php
View file

@ -264,7 +264,7 @@ class TopicSubscriptionsPager extends TablePager {
], ],
'conds' => [ 'conds' => [
'sub_user' => $this->getUser()->getId(), 'sub_user' => $this->getUser()->getId(),
'sub_state != ' . SubscriptionStore::STATE_UNSUBSCRIBED, $this->getDatabase()->expr( 'sub_state', '!=', SubscriptionStore::STATE_UNSUBSCRIBED ),
], ],
]; ];
} }

9
maintenance/FixTrailingWhitespaceIds.php
View file

@ -4,7 +4,6 @@ namespace MediaWiki\Extension\DiscussionTools\Maintenance;
use LoggedUpdateMaintenance; use LoggedUpdateMaintenance;
use Wikimedia\Rdbms\DBQueryError; use Wikimedia\Rdbms\DBQueryError;
use Wikimedia\Rdbms\IDatabase;
use Wikimedia\Rdbms\IExpression; use Wikimedia\Rdbms\IExpression;
use Wikimedia\Rdbms\LikeValue; use Wikimedia\Rdbms\LikeValue;
@ -54,19 +53,17 @@ class FixTrailingWhitespaceIds extends LoggedUpdateMaintenance {
->from( 'discussiontools_item_ids' ) ->from( 'discussiontools_item_ids' )
->field( 'itid_itemid' ) ->field( 'itid_itemid' )
->where( ->where(
$dbw->makeList( [ $dbw->orExpr( [
$dbw->expr( 'itid_itemid', IExpression::LIKE, $like1 ), $dbw->expr( 'itid_itemid', IExpression::LIKE, $like1 ),
$dbw->expr( 'itid_itemid', IExpression::LIKE, $like2 ), $dbw->expr( 'itid_itemid', IExpression::LIKE, $like2 ),
$dbw->expr( 'itid_itemid', IExpression::LIKE, $like3 ), $dbw->expr( 'itid_itemid', IExpression::LIKE, $like3 ),
], IDatabase::LIST_OR ) ] )
) )
->caller( __METHOD__ ) ->caller( __METHOD__ )
->limit( $this->getBatchSize() ); ->limit( $this->getBatchSize() );
if ( $skippedIds ) { if ( $skippedIds ) {
$itemIdQueryBuilder->where( $itemIdQueryBuilder->where( $dbw->expr( 'itid_itemid', '!=', $skippedIds ) );
'itid_itemid NOT IN (' . $dbw->makeList( $skippedIds ) . ')'
);
} }
$itemIds = $itemIdQueryBuilder->fetchFieldValues(); $itemIds = $itemIdQueryBuilder->fetchFieldValues();

2
maintenance/NewTopicOptOutActiveUsers.php
View file

@ -45,7 +45,7 @@ class NewTopicOptOutActiveUsers extends Maintenance {
'qcc_namespace' => NS_USER, 'qcc_namespace' => NS_USER,
] ) ] )
->join( 'user', null, 'qcc_title=user_name' ) ->join( 'user', null, 'qcc_title=user_name' )
->where( [ 'user_editcount >= 100' ] ) ->where( $this->dbw->expr( 'user_editcount', '>=', 100 ) )
->fields( [ 'user_id', 'user_name' ] ) ->fields( [ 'user_id', 'user_name' ] )
->fetchResultSet(); ->fetchResultSet();