Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
doctrine-dbal
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Tomáš Trávníček
doctrine-dbal
Commits
ce7489be
Commit
ce7489be
authored
Jan 22, 2016
by
Bob van de Vijver
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated connectstring doc
parent
41fc898c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
configuration.rst
docs/en/reference/configuration.rst
+5
-3
AbstractOracleDriver.php
lib/Doctrine/DBAL/Driver/AbstractOracleDriver.php
+1
-2
No files found.
docs/en/reference/configuration.rst
View file @
ce7489be
...
@@ -295,9 +295,11 @@ pdo\_oci / oci8
...
@@ -295,9 +295,11 @@ pdo\_oci / oci8
- ``instancename`` (string): Optional parameter, complete whether to
- ``instancename`` (string): Optional parameter, complete whether to
add the INSTANCE_NAME parameter in the connection. It is generally used
add the INSTANCE_NAME parameter in the connection. It is generally used
to connect to an Oracle RAC server to select the name of a particular instance.
to connect to an Oracle RAC server to select the name of a particular instance.
- ``connectstring`` (string): Complete Easy Connect connection descriptor,
Complete connection descriptors are also supported. You only need to provide the following parameter, and none of the above:
see https://docs.oracle.com/database/121/NETAG/naming.htm. When using this option,
- ``connectstring`` (string): Complete Easy Connect connection descriptor, see https://docs.oracle.com/cd/E11882_01/network.112/e41945/naming.htm.
you will still need to provide the ``user`` and ``password` parameters, but the other
parameters will no longer be used. Note that when using this parameter, the `getHost`
and `getPort` methods from `Doctrine\DBAL\Connection` will no longer function as expected.
pdo\_sqlsrv / sqlsrv
pdo\_sqlsrv / sqlsrv
^^^^^^^^^^^^^^^^^^^^
^^^^^^^^^^^^^^^^^^^^
...
...
lib/Doctrine/DBAL/Driver/AbstractOracleDriver.php
View file @
ce7489be
...
@@ -109,11 +109,10 @@ abstract class AbstractOracleDriver implements Driver, ExceptionConverterDriver
...
@@ -109,11 +109,10 @@ abstract class AbstractOracleDriver implements Driver, ExceptionConverterDriver
*
*
* @return string
* @return string
*
*
* @link https://docs.oracle.com/
cd/E11882_01/network.112/e41945
/naming.htm
* @link https://docs.oracle.com/
database/121/NETAG
/naming.htm
*/
*/
protected
function
getEasyConnectString
(
array
$params
)
protected
function
getEasyConnectString
(
array
$params
)
{
{
if
(
!
empty
(
$params
[
'connectstring'
]))
{
if
(
!
empty
(
$params
[
'connectstring'
]))
{
return
$params
[
'connectstring'
];
return
$params
[
'connectstring'
];
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment