diff options
| author | Joel Kallman <jkallman@eclarian.com> | 2012-03-12 23:10:44 +0100 |
|---|---|---|
| committer | Joel Kallman <jkallman@eclarian.com> | 2012-03-12 23:10:44 +0100 |
| commit | 7c4870c3741e165bc7bc06624c816e66db474ee2 (patch) | |
| tree | a96962212cb012be32ab09545dcd5c4dbdac05e2 /application/config/database.php | |
| parent | 10aa8e660c6f439958b79fce5d85ce7e8eecf028 (diff) | |
| parent | 6b535f51fcb94e0a645fda0d0356f4748076877e (diff) | |
Merge branch 'develop' into feature/db_toString_support
Diffstat (limited to 'application/config/database.php')
| -rw-r--r-- | application/config/database.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/application/config/database.php b/application/config/database.php index 58eec4b30..154638d1f 100644 --- a/application/config/database.php +++ b/application/config/database.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * @@ -18,7 +18,7 @@ * * @package CodeIgniter * @author EllisLab Dev Team - * @copyright Copyright (c) 2008 - 2011, EllisLab, Inc. (http://ellislab.com/) + * @copyright Copyright (c) 2008 - 2012, EllisLab, Inc. (http://ellislab.com/) * @license http://opensource.org/licenses/AFL-3.0 Academic Free License (AFL 3.0) * @link http://codeigniter.com * @since Version 1.0 @@ -37,11 +37,12 @@ | EXPLANATION OF VARIABLES | ------------------------------------------------------------------- | +| ['dsn'] The full DSN string describe a connection to the database. | ['hostname'] The hostname of your database server. | ['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. ie: mysql. Currently supported: +| ['dbdriver'] The database type. e.g.: mysql. Currently supported: 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 @@ -74,13 +75,14 @@ $active_group = 'default'; $active_record = TRUE; +$db['default']['dsn'] = ''; $db['default']['hostname'] = 'localhost'; $db['default']['username'] = ''; $db['default']['password'] = ''; $db['default']['database'] = ''; $db['default']['dbdriver'] = 'mysql'; $db['default']['dbprefix'] = ''; -$db['default']['pconnect'] = TRUE; +$db['default']['pconnect'] = FALSE; $db['default']['db_debug'] = TRUE; $db['default']['cache_on'] = FALSE; $db['default']['cachedir'] = ''; |