diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-02-10 13:40:14 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-02-10 13:40:14 +0100 |
| commit | a563fac0fb822169eb4ee8a5f98324bdab15321b (patch) | |
| tree | 485445b9af5d8ec16de8bb0cea0e7260f3d8db7c /user_guide_src | |
| parent | 569091cf6ad7101059e6a4ffbd93f227aad9937f (diff) | |
| parent | 16af6afe991381360439135ddb0735dab1280fed (diff) | |
Merge upstream branch
Diffstat (limited to 'user_guide_src')
| -rw-r--r-- | user_guide_src/source/changelog.rst | 2 | ||||
| -rw-r--r-- | user_guide_src/source/database/configuration.rst | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index af340cbe8..d14eea7a9 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -49,6 +49,8 @@ Release Date: Not Released - Adding $escape parameter to the order_by function, this enables ordering by custom fields. - MySQLi driver now uses mysqli_get_server_info() for server version checking. - 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. - Improved support of the Oracle (OCI8) driver, including: - Added support for dropping tables to :doc:`Database Forge <database/forge>`. - Added support for listing database schemas to :doc:`Database Utilities <database/utilities>`. diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst index 4f88c25ab..040e7e33f 100644 --- a/user_guide_src/source/database/configuration.rst +++ b/user_guide_src/source/database/configuration.rst @@ -28,6 +28,10 @@ prototype:: $db['default']['autoinit'] = TRUE; $db['default']['stricton'] = FALSE; +If you use PDO as your dbdriver, you can specify the full DSN string describe a connection to the database like this:: + + $db['default']['dsn'] = 'pgsql:host=localhost;port=5432;dbname=database_name'; + You can also specify failovers for the situation when the main connection cannot connect for some reason. These failovers can be specified by setting the failover for a connection like this:: |