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

Clean up query code

Browse source
This commit is contained in:
Niklas Laxström 2010-07-10 08:14:39 +00:00
parent dcd4df4e44
commit 8e4c869f35
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
includes/LinkBatch.php
View file

@ -136,23 +136,19 @@ class LinkBatch {
}
wfProfileIn( __METHOD__ );
// Construct query
// This is very similar to Parser::replaceLinkHolders
// This is similar to LinkHolderArray::replaceInternal
$dbr = wfGetDB( DB_SLAVE );
$page = $dbr->tableName( 'page' );
$set = $this->constructSet( 'page', $dbr );
if ( $set === false ) {
wfProfileOut( __METHOD__ );
return false;
}
$sql = "SELECT page_id, page_namespace, page_title, page_len, page_is_redirect, page_latest FROM $page WHERE $set";
$table = 'page';
$fields = array( 'page_id', 'page_namespace', 'page_title', 'page_len',
'page_is_redirect', 'page_latest' );
$conds = $this->constructSet( 'page', $dbr );
// Do query
$caller = __METHOD__;
if ( strval( $this->caller ) !== '' ) {
$caller .= " (for {$this->caller})";
}
$res = $dbr->query( $sql, $caller );
$res = $dbr->select( $table, $fields, $conds, $caller );
wfProfileOut( __METHOD__ );
return $res;
}
@ -165,6 +161,6 @@ class LinkBatch {
* @return mixed string with SQL where clause fragment, or false if no items.
*/
public function constructSet( $prefix, $db ) {
return $db->makeWhereFrom2d( $this->data, "{$prefix}_namespace", "{$prefix}_title" );
return $db->makeWhereFrom2d( $this->data, "{$prefix}_namespace", "{$prefix}_title" );
}
}