diff options
| author | Jamie Rumbelow <jamie@jamierumbelow.net> | 2012-02-28 16:40:18 +0100 |
|---|---|---|
| committer | Jamie Rumbelow <jamie@jamierumbelow.net> | 2012-02-28 16:40:18 +0100 |
| commit | 576b47e9947d4f5bc25a3f72e3978a3d7f9ca1de (patch) | |
| tree | 286194a87e7388970e3e546fabb0690e0a349342 /user_guide_src | |
| parent | ae123e0b3d749a13d8820d0a6b773ca25b0ed380 (diff) | |
| parent | 0aa8c60ae7eee0122c42ae17d42fd5471a575743 (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into develop
Diffstat (limited to 'user_guide_src')
| -rw-r--r-- | user_guide_src/source/changelog.rst | 3 | ||||
| -rw-r--r-- | user_guide_src/source/database/connecting.rst | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 5ad3c3cbc..0803290fa 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -53,6 +53,7 @@ Release Date: Not Released - MySQLi driver now supports persistent connections when running on PHP >= 5.3. - Added dsn if the group connections in the config use PDO or any driver which need DSN. - Improved PDO database support. + - An optional database name parameter was added db_select(). - Libraries @@ -108,6 +109,8 @@ Bug fixes for 3.0 - Fixed a bug (#154) - ``CI_Session::sess_update()`` caused the session to be destroyed on pages where multiple AJAX requests were executed at once. - Fixed a possible bug in ``CI_Input::is_ajax_request()`` where some clients might not send the X-Requested-With HTTP header value exactly as 'XmlHttpRequest'. - Fixed a bug (#1039) - MySQL's _backup() method failed due to a table name not being escaped. +- Fixed a bug (#1070) - CI_DB_driver::initialize() didn't set a character set if a database is not selected. +- Fixed a bug (#177) - CI_Form_validation::set_value() didn't set the default value if POST data is NULL. Version 2.1.0 ============= diff --git a/user_guide_src/source/database/connecting.rst b/user_guide_src/source/database/connecting.rst index 4db038e1e..5822ca62c 100644 --- a/user_guide_src/source/database/connecting.rst +++ b/user_guide_src/source/database/connecting.rst @@ -122,6 +122,12 @@ return the database object. | $DB1->result(); | etc... +.. note:: You don't need to create separate database configurations if you + only need to use a different database on the same connection. You + can switch to a different database when you need to, like this: + + | $this->db->db_select($database2_name); + Reconnecting / Keeping the Connection Alive =========================================== |