summaryrefslogtreecommitdiffstats
path: root/system/database
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-09-20 16:03:22 +0200
committerFlorian Pritz <bluewind@xinu.at>2015-09-20 16:03:22 +0200
commit7da9de48d2b3bbb0309d6311e4dc7d275d3bf26d (patch)
treebc90956bccaad107255e350ed29cad242eede5cc /system/database
parentf149a0d1abb4a79b1d5de9ddb5963b2eab4b126d (diff)
parente79c1c45dcd23dde1f4b072993829cc008f4858b (diff)
Merge branch 'postgres' into dev
Diffstat (limited to 'system/database')
-rw-r--r--system/database/drivers/postgre/postgre_driver.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index 2b1d53953..c9365fdb1 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -158,7 +158,8 @@ class CI_DB_postgre_driver extends CI_DB {
*/
function _version()
{
- return "SELECT version() AS ver";
+ $pg_version = pg_version($this->conn_id);
+ return $pg_version;
}
// --------------------------------------------------------------------