diff options
Diffstat (limited to 'includes/database/pgsql')
| -rw-r--r-- | includes/database/pgsql/database.inc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/includes/database/pgsql/database.inc b/includes/database/pgsql/database.inc index 04e403222..6fd15b2e7 100644 --- a/includes/database/pgsql/database.inc +++ b/includes/database/pgsql/database.inc @@ -13,20 +13,13 @@ class DatabaseConnection_pgsql extends DatabaseConnection { - protected $transactionSupport; + 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; - $connection_options += array( - 'transactions' => TRUE, - ); - $this->transactionSupport = $connection_options['transactions']; - - $dsn = 'pgsql:host=' . $connection_options['host'] . ' dbname=' . $connection_options['database']; - if (!empty($connection_options['port'])) { - $dsn .= ' port=' . $connection_options['port']; - } - + $dsn = 'pgsql:host=' . $connection_options['host'] . ' dbname=' . $connection_options['database'] . ' port=' . $connection_options['port']; parent::__construct($dsn, $connection_options['username'], $connection_options['password'], array( // Convert numeric values to strings when fetching. PDO::ATTR_STRINGIFY_FETCHES => TRUE, |