Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CommentStore: Use SelectQueryBuilder

Browse source 
Cleaner

Bug: T311866
Change-Id: If3df302b63d7329bdffebf7f93385b249396ebec
This commit is contained in:
Amir Sarabadani 2022-11-18 16:42:04 +01:00
parent 75351035d8
commit 4ba40f2d2b
1 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
includes/CommentStore.php
View file

@ -280,12 +280,11 @@ class CommentStore {
);
}
$id = $row["{$key}_id"];
$row2 = $db->selectRow(
'comment',
[ 'comment_id', 'comment_text', 'comment_data' ],
[ 'comment_id' => $id ],
__METHOD__
);
$row2 = $db->newSelectQueryBuilder()
->select( [ 'comment_id', 'comment_text', 'comment_data' ] )
->from( 'comment' )
->where( [ 'comment_id' => $id ] )
->caller( __METHOD__ )->fetchRow();
}
if ( !$row2 && ( $tempTableStage & SCHEMA_COMPAT_READ_OLD ) &&
array_key_exists( "{$key}_pk", $row )
@ -298,17 +297,15 @@ class CommentStore {
}
$t = static::TEMP_TABLES[$key];
$id = $row["{$key}_pk"];
$row2 = $db->selectRow(
$row2 = $db->newSelectQueryBuilder()
->select( [ 'comment_id', 'comment_text', 'comment_data' ] )
// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset Only set for stage old
[ $t['table'], 'comment' ],
[ 'comment_id', 'comment_text', 'comment_data' ],
->from( $t['table'] )
// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset Only set for stage old
[ $t['pk'] => $id ],
__METHOD__,
[],
->join( 'comment', null, [ "comment_id = {$t['field']}" ] )
// @phan-suppress-next-line PhanTypePossiblyInvalidDimOffset Only set for stage old
[ 'comment' => [ 'JOIN', [ "comment_id = {$t['field']}" ] ] ]
);
->where( [ $t['pk'] => $id ] )
->caller( __METHOD__ )->fetchRow();
}
if ( $row2 === null && $fallback && isset( $row[$key] ) ) {
wfLogWarning( "Using deprecated fallback handling for comment $key" );
@ -464,16 +461,15 @@ class CommentStore {
}
$hash = self::hash( $comment->text, $dbData );
$commentId = $dbw->selectField(
'comment',
'comment_id',
[
$commentId = $dbw->newSelectQueryBuilder()
->select( 'comment_id' )
->from( 'comment' )
->where( [
'comment_hash' => $hash,
'comment_text' => $comment->text,
'comment_data' => $dbData,
],
__METHOD__
);
] )
->caller( __METHOD__ )->fetchField();
if ( !$commentId ) {
$dbw->insert(
'comment',