Many new Active Record functions, and another whack of stuff

1 files changed, 49 insertions, 48 deletions

diff --git a/system/application/config/database.php b/system/application/config/database.php
index 5293a5a6a..1ee0c4bb4 100644
--- a/system/application/config/database.php
+++ b/system/application/config/database.php
@@ -1,49 +1,50 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
-/*
-| -------------------------------------------------------------------
-| DATABASE CONNECTIVITY SETTINGS
-| -------------------------------------------------------------------
-| This file will contain the settings needed to access your database.
-|
-| For complete instructions please consult the "Database Connection"
-| page of the User Guide.
-|
-| -------------------------------------------------------------------
-| EXPLANATION OF VARIABLES
-| -------------------------------------------------------------------
-|
-|	['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:
-				 mysql, mysqli, postgre, odbc, mssql
-|	['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
-|	['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
-|	['active_r'] TRUE/FALSE - Whether to load the active record class
-|	['cache_on'] TRUE/FALSE - Enables/disables query caching
-|	['cachedir'] The path to the folder where cache files should be stored
-|
-| The $active_group variable lets you choose which connection group to
-| make active.  By default there is only one group (the "default" group).
-|
-*/
-
-$active_group = "default";
-
-$db['default']['hostname'] = "localhost";
-$db['default']['username'] = "root";
-$db['default']['password'] = "";
-$db['default']['database'] = "test";
-$db['default']['dbdriver'] = "mysql";
-$db['default']['dbprefix'] = "";
-$db['default']['active_r'] = TRUE;
-$db['default']['pconnect'] = TRUE;
-$db['default']['db_debug'] = TRUE;
-$db['default']['cache_on'] = FALSE;
-$db['default']['cachedir'] = "";
-
-
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');

+/*

+| -------------------------------------------------------------------

+| DATABASE CONNECTIVITY SETTINGS

+| -------------------------------------------------------------------

+| This file will contain the settings needed to access your database.

+|

+| For complete instructions please consult the "Database Connection"

+| page of the User Guide.

+|

+| -------------------------------------------------------------------

+| EXPLANATION OF VARIABLES

+| -------------------------------------------------------------------

+|

+|	['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:

+				 mysql, mysqli, postgre, odbc, mssql

+|	['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

+|	['db_debug'] TRUE/FALSE - Whether database errors should be displayed.

+|	['active_r'] TRUE/FALSE - Whether to load the active record class

+|	['cache_on'] TRUE/FALSE - Enables/disables query caching

+|	['cachedir'] The path to the folder where cache files should be stored

+|

+| The $active_group variable lets you choose which connection group to

+| make active.  By default there is only one group (the "default" group).

+|

+*/

+

+$active_group = "default";

+

+$db['default']['hostname'] = "localhost";

+$db['default']['username'] = "";

+$db['default']['password'] = "";

+$db['default']['database'] = "";

+$db['default']['dbdriver'] = "mysql";

+$db['default']['dbprefix'] = "";

+$db['default']['active_r'] = TRUE;

+$db['default']['pconnect'] = TRUE;

+$db['default']['db_debug'] = TRUE;

+$db['default']['cache_on'] = FALSE;

+$db['default']['cachedir'] = "";

+$db['default']['char_set'] = "utf8";

+$db['default']['dbcollat'] = "utf8_general_ci";

+

 ?>
\ No newline at end of file