summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2010-03-10 21:18:38 +0100
committerDerek Jones <derek.jones@ellislab.com>2010-03-10 21:18:38 +0100
commitad1171a6797dc0054381327fb26a9e9e232a639e (patch)
treeda843d2b07969d7a2896926e86c27269b7142d39 /system
parent536558bdd4dd04abade1f7d8424de2abd88d978c (diff)
added swap_pre, autoinit, and stricton database configuration explanations
Diffstat (limited to 'system')
-rw-r--r--system/application/config/database.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/system/application/config/database.php b/system/application/config/database.php
index 28dfff5c9..fcdefda71 100644
--- a/system/application/config/database.php
+++ b/system/application/config/database.php
@@ -26,6 +26,8 @@
| ['cachedir'] The path to the folder where cache files should be stored
| ['char_set'] The character set used in communicating with the database
| ['dbcollat'] The character collation used in communicating with the database
+| ['swap_pre'] A default table prefix that should be swapped with the dbprefix
+| ['autoinit'] Whether or not to automatically initialize the database.
| ['stricton'] TRUE/FALSE - forces "Strict Mode" connections
| - good for ensuring strict SQL while developing
|
@@ -51,6 +53,8 @@ $db['default']['cache_on'] = FALSE;
$db['default']['cachedir'] = "";
$db['default']['char_set'] = "utf8";
$db['default']['dbcollat'] = "utf8_general_ci";
+$db['default']['swap_pre'] = "";
+$db['default']['autoinit'] = TRUE;
$db['default']['stricton'] = FALSE;