diff options
| author | Florian Pritz <bluewind@xinu.at> | 2022-01-09 11:31:26 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2022-01-09 11:31:26 +0100 |
| commit | 5fb561ed3d972659213de47cb67fdc094adfbc1e (patch) | |
| tree | febd9f7e45d93801c2207691532cad144a848179 /system/database/drivers/postgre/postgre_driver.php | |
| parent | 82141c4baf5a1436b6eca8b1efa6e2bff3991179 (diff) | |
| parent | ad57720c57c11620c77181655d637a5bfdbe2643 (diff) | |
Merge remote-tracking branch 'upstream/3.1-stable' into dev
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'system/database/drivers/postgre/postgre_driver.php')
| -rw-r--r-- | system/database/drivers/postgre/postgre_driver.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 84717d8b5..eb11a556a 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -135,7 +135,7 @@ class CI_DB_postgre_driver extends CI_DB { * Database connection * * @param bool $persistent - * @return resource + * @return resource|object */ public function db_connect($persistent = FALSE) { @@ -226,7 +226,7 @@ class CI_DB_postgre_driver extends CI_DB { * Execute the query * * @param string $sql an SQL query - * @return resource + * @return resource|object */ protected function _execute($sql) { |