diff options
author | Andrey Andreev <narf@bofh.bg> | 2012-02-24 10:58:37 +0100 |
---|---|---|
committer | Andrey Andreev <narf@bofh.bg> | 2012-02-24 10:58:37 +0100 |
commit | 775cecf4e5d850796aa05f7e49d58e5afaf93d13 (patch) | |
tree | b4fb4746722ca834e3fbdbdf4c54ca747a1f8c7f /user_guide_src | |
parent | b78c64b0bb43333c5d74d718cd1270e514f44071 (diff) | |
parent | 5148029aaf204fb3e7e4f24a794bee781d0c218b (diff) |
Merge upstream branch
Diffstat (limited to 'user_guide_src')
-rw-r--r-- | user_guide_src/source/changelog.rst | 1 | ||||
-rw-r--r-- | user_guide_src/source/database/connecting.rst | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 8e0580f5f..d5125591c 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -51,6 +51,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(). - Improved support of the Oracle (OCI8) driver, including: - Added DSN string support (Easy Connect and TNS). - Added support for dropping tables to :doc:`Database Forge <database/forge>`. diff --git a/user_guide_src/source/database/connecting.rst b/user_guide_src/source/database/connecting.rst index a834cc0f7..fb4524116 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 =========================================== |