diff options
| author | Andrey Andreev <narf@devilix.net> | 2014-12-16 16:21:07 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2014-12-16 16:21:07 +0100 |
| commit | e8b9c85f1a3de400256586b657f87bc8f2158d5e (patch) | |
| tree | b087264e52a09322d66e1ca63ab009138e627ec3 /system | |
| parent | 42bc6d51e15c180f35632d5c03c649225f8dbf74 (diff) | |
| parent | 7830173a28dc8e3959ea9a78a334ad10c668f13f (diff) | |
Merge pull request #3416 from jim-parry/userguide/db_driver_reference
User Guide - DB Driver Reference
Diffstat (limited to 'system')
| -rw-r--r-- | system/database/DB_driver.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index 7c3df42b8..fdd99167f 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -964,7 +964,7 @@ abstract class CI_DB_driver { * Calculate the aggregate query elapsed time * * @param int The number of decimal places - * @return int + * @return string */ public function elapsed_time($decimals = 6) { @@ -1034,7 +1034,7 @@ abstract class CI_DB_driver { /** * Escape String * - * @param string $str + * @param string|string[] $str * @param bool $like Whether or not the string will be used in a LIKE condition * @return string */ @@ -1103,7 +1103,7 @@ abstract class CI_DB_driver { * position is the primary key * * @param string the table name - * @return string + * @return mixed */ public function primary($table = '') { @@ -1146,7 +1146,7 @@ abstract class CI_DB_driver { * Returns an array of table names * * @param string $constrain_by_prefix = FALSE - * @return array + * @return mixed */ public function list_tables($constrain_by_prefix = FALSE) { @@ -1214,7 +1214,7 @@ abstract class CI_DB_driver { * Fetch Field Names * * @param string the table name - * @return array + * @return mixed */ public function list_fields($table = '') { |