diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2011-10-05 19:24:45 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2011-10-05 19:24:45 +0200 |
| commit | 044a5221843cc2d88b936f3e658a1df4bc28cfe2 (patch) | |
| tree | 9845376e277aa822c41835c8ca8bc94a4cf23756 /application/config/database.php | |
| parent | 47a62548cfdcd5fb6588a2caa92d3b55ac05de6f (diff) | |
| parent | d1ecd5cd4ae6ab5d37df9fbda14b93977b9e743c (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'application/config/database.php')
| -rw-r--r-- | application/config/database.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application/config/database.php b/application/config/database.php index b4b34bf66..5a84a471a 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -17,7 +17,7 @@ | ['password'] The password used to connect to the database | ['database'] The name of the database you want to connect to | ['dbdriver'] The database type. ie: mysql. Currently supported: - mysql, mysqli, postgre, odbc, mssql, sqlite, oci8 + mysql, mysqli, pdo, postgre, odbc, mssql, sqlite, oci8 | ['dbprefix'] You can add an optional prefix, which will be added | to the table name when using the Active Record class | ['pconnect'] TRUE/FALSE - Whether to use a persistent connection |