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

added flags accessor, fixed select/update option array bugs

Browse source
This commit is contained in:
Tim Starling 2005-08-14 14:42:54 +00:00
parent e58161e85e
commit 4d6079f554
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
includes/Database.php
View file

@ -136,6 +136,18 @@ class Database {
function isOpen() { return $this->mOpened; }
/**#@-*/
function setFlag( $flag ) {
$this->mFlags |= $flag;
}
function clearFlag( $flag ) {
$this->mFlags &= ~$flag;
}
function getFlag( $flag ) {
return !!($this->mFlags & $flag);
}
#------------------------------------------------------------------------------
# Other functions
#------------------------------------------------------------------------------
@ -693,7 +705,10 @@ class Database {
if ( isset( $options['ORDER BY'] ) ) {
$tailOpts .= " ORDER BY {$options['ORDER BY']}";
}
if (isset($options['LIMIT'])) {
$tailOpts .= $this->limitResult('', $options['LIMIT'],
isset($options['OFFSET']) ? $options['OFFSET'] : false);
}
if ( is_numeric( array_search( 'FOR UPDATE', $options ) ) ) {
$tailOpts .= ' FOR UPDATE';
}
@ -739,9 +754,7 @@ class Database {
} else {
$sql = "SELECT $vars $from $useIndex $tailOpts";
}
if (isset($options['LIMIT'])) {
$sql = $this->limitResult($sql, $options['LIMIT'], isset($options['OFFSET']) ? $options['OFFSET'] : false);
}
return $this->query( $sql, $fname );
}
@ -971,7 +984,7 @@ class Database {
*/
function makeUpdateOptions( $options ) {
if( !is_array( $options ) ) {
wfDebugDieBacktrace( 'makeUpdateOptions given non-array' );
$options = array( $options );
}
$opts = array();
if ( in_array( 'LOW_PRIORITY', $options ) )