summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
authorTimothy Warren <tim@timshomepage.net>2012-02-27 22:56:39 +0100
committerTimothy Warren <tim@timshomepage.net>2012-02-27 22:56:39 +0100
commit2d87f8458f30057af466cd4b3b5edcf568861691 (patch)
tree37b21f5b14119445a4cf1b3fd338e48f82ac0cdf /user_guide_src
parent03f8ec00afb0da44c2191c4248832a37f7bd3c1f (diff)
parentd8a0aed00b2174af5cac96ecada10ea392e19120 (diff)
Merge upstream
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/changelog.rst1
-rw-r--r--user_guide_src/source/database/connecting.rst6
2 files changed, 7 insertions, 0 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index c3f9ff065..cd82c0148 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -52,6 +52,7 @@ Release Date: Not Released
- Added dsn if the group connections in the config use PDO or any driver which need DSN.
- Improved PDO database support.
- Added Interbase/Firebird database support via the "interbase" driver
+ - An optional database name parameter was added db_select().
- Libraries
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
===========================================