diff options
| author | Dries Buytaert <dries@buytaert.net> | 2008-12-02 19:45:01 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2008-12-02 19:45:01 +0000 |
| commit | 71a22f1c1f4da46a370dd11b9e31537f255c7375 (patch) | |
| tree | 41e0c79282557b7f1ed878bf78ad482c2ce2f102 /includes/database/pgsql | |
| parent | 8900c6156d3ab1e48c8e8ff697305ce6530fbe5a (diff) | |
| download | brdo-71a22f1c1f4da46a370dd11b9e31537f255c7375.tar.gz brdo-71a22f1c1f4da46a370dd11b9e31537f255c7375.tar.bz2 | |
- Patch #337926 by Damien Tournoud: clean-up lower case handling.
Diffstat (limited to 'includes/database/pgsql')
| -rw-r--r-- | includes/database/pgsql/database.inc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/includes/database/pgsql/database.inc b/includes/database/pgsql/database.inc index 6fd15b2e7..53e7b3578 100644 --- a/includes/database/pgsql/database.inc +++ b/includes/database/pgsql/database.inc @@ -13,11 +13,14 @@ class DatabaseConnection_pgsql extends DatabaseConnection { - protected $transactionSupport = TRUE; - public function __construct(Array $connection_options = array()) { - $this->transactionSupport = isset($connection_options['transactions']) ? $connection_options['transactions'] : TRUE; - $connection_options['port'] = !empty($connection_options['port']) ? $connection_options['port'] : 5432; + // This driver defaults to transaction support, except if explicitly passed FALSE. + $this->transactionSupport = !isset($connection_options['transactions']) || $connection_options['transactions'] === FALSE; + + // Default to TCP connection on port 5432. + if (empty($connection_options['port'])) { + $connection_options['port'] = 5432; + } $dsn = 'pgsql:host=' . $connection_options['host'] . ' dbname=' . $connection_options['database'] . ' port=' . $connection_options['port']; parent::__construct($dsn, $connection_options['username'], $connection_options['password'], array( @@ -86,10 +89,6 @@ class DatabaseConnection_pgsql extends DatabaseConnection { return 'pgsql'; } - public function supportsTransactions() { - return $this->transactionSupport; - } - public function mapConditionOperator($operator) { static $specials = array( // In PostgreSQL, 'LIKE' is case-sensitive. For case-insensitive LIKE |