Merge "ExternalLinks: Make order by and continue only rely on el_id in READ NEW"
This commit is contained in:
commit
1cca78c098
3 changed files with 18 additions and 3 deletions
|
|
@ -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->addFields( $orderBy ); // Make sure
|
||||
|
|
|
|||
|
|
@ -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->addFields( $orderBy ); // Make sure
|
||||
|
|
|
|||
|
|
@ -217,7 +217,12 @@ class SpecialLinkSearch extends QueryPage {
|
|||
$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 = [
|
||||
'tables' => [ 'page', 'externallinks' ],
|
||||
|
|
|
|||
Loading…
Reference in a new issue