diff options
author | Dries Buytaert <dries@buytaert.net> | 2009-01-08 09:52:12 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2009-01-08 09:52:12 +0000 |
commit | 9af9e3de8851ee43ef77c90205bd1cfe9af15358 (patch) | |
tree | 734abca89eba6c0e30a20cdd461b9b56d3b676b7 /includes/database/database.inc | |
parent | a7b4bdef1d053bfd00342b5250b98153c7a6be5e (diff) | |
download | brdo-9af9e3de8851ee43ef77c90205bd1cfe9af15358.tar.gz brdo-9af9e3de8851ee43ef77c90205bd1cfe9af15358.tar.bz2 |
- Patch #342503 by Josh Waihi, Damien Tournoud et al: schema function findTables fails on PostgreSQL.
Diffstat (limited to 'includes/database/database.inc')
-rw-r--r-- | includes/database/database.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc index 25f570e5d..669245629 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -380,14 +380,14 @@ abstract class DatabaseConnection extends PDO { * Queries sent to Drupal should wrap all table names in curly brackets. This * function searches for this syntax and adds Drupal's table prefix to all * tables, allowing Drupal to coexist with other systems in the same database - * if necessary. + * and/or schema if necessary. * * @param $sql * A string containing a partial or entire SQL query. * @return * The properly-prefixed string. */ - protected function prefixTables($sql) { + public function prefixTables($sql) { global $db_prefix; if (is_array($db_prefix)) { @@ -428,7 +428,7 @@ abstract class DatabaseConnection extends PDO { * A PDO prepared statement ready for its execute() method. */ protected function prepareQuery($query, $cache = TRUE) { - $query = self::prefixTables($query); + $query = $this->prefixTables($query); if (empty($this->preparedStatements[$query])) { // Call PDO::prepare. $this->preparedStatements[$query] = parent::prepare($query); |