diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-03 02:19:28 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-03 02:19:28 +0100 |
| commit | 08856b8738ea4fc17b13986c9f2619383cb4a6e9 (patch) | |
| tree | f214c1498b4ec7cc1958b3654353748954a2a141 /system/database/drivers/pdo/pdo_driver.php | |
| parent | 75b2c7fd0e23afc5c0338a7b62854d38b37b9c62 (diff) | |
Improve DB version() implementation and add pg_version() support
Diffstat (limited to 'system/database/drivers/pdo/pdo_driver.php')
| -rw-r--r-- | system/database/drivers/pdo/pdo_driver.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/system/database/drivers/pdo/pdo_driver.php b/system/database/drivers/pdo/pdo_driver.php index de5e1f05e..8fdfd58fb 100644 --- a/system/database/drivers/pdo/pdo_driver.php +++ b/system/database/drivers/pdo/pdo_driver.php @@ -289,13 +289,15 @@ class CI_DB_pdo_driver extends CI_DB { // -------------------------------------------------------------------- /** - * Version number query string + * Database version number * * @return string */ - protected function _version() + public function version() { - return $this->conn_id->getAttribute(PDO::ATTR_SERVER_VERSION); + return isset($this->data_cache['version']) + ? $this->data_cache['version'] + : $this->data_cache['version'] = $this->conn_id->getAttribute(PDO::ATTR_SERVER_VERSION); } // -------------------------------------------------------------------- @@ -499,7 +501,7 @@ class CI_DB_pdo_driver extends CI_DB { */ public function insert_id($name = NULL) { - if ($this->pdodriver === 'pgsql' && $name === NULL && $this->_version() >= '8.1') + if ($this->pdodriver === 'pgsql' && $name === NULL && $this->version() >= '8.1') { $query = $this->query('SELECT LASTVAL() AS ins_id'); $query = $query->row(); |