diff options
| author | Eric Roberts <eric@cryode.com> | 2012-07-11 10:43:36 +0200 |
|---|---|---|
| committer | Eric Roberts <eric@cryode.com> | 2012-07-11 10:43:36 +0200 |
| commit | fa337081ced1b1d34805d28f8307f069edf16cdf (patch) | |
| tree | 63e524a282d7a8efef45b205c42f9b8e4a06b89b /application/config/database.php | |
| parent | 6bf1e50bdff62d4842cd5a94d324e0768c5ace3e (diff) | |
| parent | 78e5fdfe4399975b75b8697f64e270b1799ee2f1 (diff) | |
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'application/config/database.php')
| -rw-r--r-- | application/config/database.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/application/config/database.php b/application/config/database.php index cb6ebad10..bb0d87be0 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -42,8 +42,9 @@ | ['username'] The username used to connect to the database | ['password'] The password used to connect to the database | ['database'] The name of the database you want to connect to -| ['dbdriver'] The database type. e.g.: mysql. Currently supported: -| cubrid, interbase, mssql, mysql, mysqli, oci8, +| ['dbdriver'] The database driver. e.g.: mysqli. + Currently supported: +| cubrid, ibase, mssql, mysql, mysqli, oci8, | odbc, pdo, postgre, sqlite, sqlite3, sqlsrv | ['dbprefix'] You can add an optional prefix, which will be added | to the table name when using the Query Builder class |