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
8ffaaa88
Commit
8ffaaa88
authored
Mar 25, 2014
by
Benjamin Eberlei
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #544 from facupanizza/master
ORACLE, (INSTANCE_NAME = XXXXX)
parents
c61361d8
4f366bba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
1 deletion
+10
-1
configuration.rst
docs/en/reference/configuration.rst
+4
-0
AbstractOracleDriver.php
lib/Doctrine/DBAL/Driver/AbstractOracleDriver.php
+6
-1
No files found.
docs/en/reference/configuration.rst
View file @
8ffaaa88
...
...
@@ -193,6 +193,10 @@ pdo\_oci / oci8
connection pooling.
- ``charset`` (string): The charset used when connecting to the
database.
- ``instancename`` (string): Optional parameter, complete whether to
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.
pdo\_sqlsrv / sqlsrv
^^^^^^^^^^^^^^^^^^^^
...
...
lib/Doctrine/DBAL/Driver/AbstractOracleDriver.php
View file @
8ffaaa88
...
...
@@ -124,10 +124,15 @@ abstract class AbstractOracleDriver implements Driver, ExceptionConverterDriver
$service
=
'SID='
.
$serviceName
;
$pooled
=
''
;
$instance
=
''
;
if
(
isset
(
$params
[
'service'
])
&&
$params
[
'service'
]
==
true
)
{
$service
=
'SERVICE_NAME='
.
$serviceName
;
}
if
(
isset
(
$params
[
'instancename'
])
&&
!
empty
(
$params
[
'instancename'
]))
{
$instance
=
'(INSTANCE_NAME = '
.
$params
[
'instancename'
]
.
')'
;
}
if
(
isset
(
$params
[
'pooled'
])
&&
$params
[
'pooled'
]
==
true
)
{
$pooled
=
'(SERVER=POOLED)'
;
...
...
@@ -135,7 +140,7 @@ abstract class AbstractOracleDriver implements Driver, ExceptionConverterDriver
return
'(DESCRIPTION='
.
'(ADDRESS=(PROTOCOL=TCP)(HOST='
.
$params
[
'host'
]
.
')(PORT='
.
$params
[
'port'
]
.
'))'
.
'(CONNECT_DATA=('
.
$service
.
')'
.
$pooled
.
'))'
;
'(CONNECT_DATA=('
.
$service
.
')'
.
$
instance
.
$
pooled
.
'))'
;
}
...
...
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