Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #561422 by sun, dalin, lyricnz, catch, Gerhard Killesreiter: Replace strtr() with str_replace() for db prefixing for increased performance.

8.0.x
webchick 2011-06-22 17:42:44 -07:00
parent 743b895a84
commit 8f139a8141
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
includes/database/database.inc
View File

@ -288,6 +288,20 @@ abstract class DatabaseConnection extends PDO {
*/
protected $prefixes = array();
/**
* List of search values for use in prefixTables().
*
* @var array
*/
protected $prefixSearch = array();
/**
* List of replacement values for use in prefixTables().
*
* @var array
*/
protected $prefixReplace = array();
function __construct($dsn, $username, $password, $driver_options = array()) {
// Initialize and prepare the connection prefix.
$this->setPrefix(isset($this->connectionOptions['prefix']) ? $this->connectionOptions['prefix'] : '');
@ -391,6 +405,20 @@ abstract class DatabaseConnection extends PDO {
$this->defaultPrefix = $prefix;
$this->prefixes = array();
}
// Set up variables for use in prefixTables(). Replace table-specific
// prefixes first.
$this->prefixSearch = array();
$this->prefixReplace = array();
foreach ($this->prefixes as $key => $val) {
$this->prefixSearch[] = '{' . $key . '}';
$this->prefixReplace[] = $val . $key;
}
// Then replace remaining tables with the default prefix.
$this->prefixSearch[] = '{';
$this->prefixReplace[] = $this->defaultPrefix;
$this->prefixSearch[] = '}';
$this->prefixReplace[] = '';
}
/**
@ -408,12 +436,7 @@ abstract class DatabaseConnection extends PDO {
* The properly-prefixed string.
*/
public function prefixTables($sql) {
// Replace specific table prefixes first.
foreach ($this->prefixes as $key => $val) {
$sql = strtr($sql, array('{' . $key . '}' => $val . $key));
}
// Then replace remaining tables with the default prefix.
return strtr($sql, array('{' => $this->defaultPrefix , '}' => ''));
return str_replace($this->prefixSearch, $this->prefixReplace, $sql);
}
/**