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

Merge "ExternalLinks: Make order by and continue only rely on el_id in READ NEW"

Browse source
This commit is contained in:
jenkins-bot 2023-07-05 17:35:47 +00:00 committed by Gerrit Code Review
commit 1cca78c098
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
includes/api/ApiQueryExtLinksUsage.php
View file

@ -123,7 +123,12 @@ class ApiQueryExtLinksUsage extends ApiQueryGeneratorBase {
} }
} }
$orderBy[] = 'el_id'; if ( $migrationStage & SCHEMA_COMPAT_READ_OLD ) {
$orderBy[] = 'el_id';
} else {
// READ NEW doesn't need this complex continuation
$orderBy = [ 'el_id' ];
}
$this->addOption( 'ORDER BY', $orderBy ); $this->addOption( 'ORDER BY', $orderBy );
$this->addFields( $orderBy ); // Make sure $this->addFields( $orderBy ); // Make sure

7
includes/api/ApiQueryExternalLinks.php
View file

@ -114,7 +114,12 @@ class ApiQueryExternalLinks extends ApiQueryBase {
} }
} }
$orderBy[] = 'el_id'; if ( $migrationStage & SCHEMA_COMPAT_READ_OLD ) {
$orderBy[] = 'el_id';
} else {
// READ NEW doesn't need this complex continuation
$orderBy = [ 'el_id' ];
}
$this->addOption( 'ORDER BY', $orderBy ); $this->addOption( 'ORDER BY', $orderBy );
$this->addFields( $orderBy ); // Make sure $this->addFields( $orderBy ); // Make sure

7
includes/specials/SpecialLinkSearch.php
View file

@ -217,7 +217,12 @@ class SpecialLinkSearch extends QueryPage {
$orderBy[] = $field; $orderBy[] = $field;
} }
$orderBy[] = 'el_id'; if ( $migrationStage & SCHEMA_COMPAT_READ_OLD ) {
$orderBy[] = 'el_id';
} else {
// READ NEW doesn't need this complex continuation
$orderBy = [ 'el_id' ];
}
$retval = [ $retval = [
'tables' => [ 'page', 'externallinks' ], 'tables' => [ 'page', 'externallinks' ],