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
5aec5359
Commit
5aec5359
authored
Jul 18, 2011
by
Max Romanovsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed: MySQL Driver didn't return Database name if DBAL was initialized using existing PDO instance
parent
f62b4a5d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
Driver.php
lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php
+6
-2
No files found.
lib/Doctrine/DBAL/Driver/PDOMySql/Driver.php
View file @
5aec5359
...
@@ -71,7 +71,7 @@ class Driver implements \Doctrine\DBAL\Driver
...
@@ -71,7 +71,7 @@ class Driver implements \Doctrine\DBAL\Driver
if
(
isset
(
$params
[
'charset'
]))
{
if
(
isset
(
$params
[
'charset'
]))
{
$dsn
.=
'charset='
.
$params
[
'charset'
]
.
';'
;
$dsn
.=
'charset='
.
$params
[
'charset'
]
.
';'
;
}
}
return
$dsn
;
return
$dsn
;
}
}
...
@@ -93,6 +93,10 @@ class Driver implements \Doctrine\DBAL\Driver
...
@@ -93,6 +93,10 @@ class Driver implements \Doctrine\DBAL\Driver
public
function
getDatabase
(
\Doctrine\DBAL\Connection
$conn
)
public
function
getDatabase
(
\Doctrine\DBAL\Connection
$conn
)
{
{
$params
=
$conn
->
getParams
();
$params
=
$conn
->
getParams
();
return
$params
[
'dbname'
];
if
(
isset
(
$params
[
'dbname'
]))
{
return
$params
[
'dbname'
];
}
return
$conn
->
query
(
'SELECT DATABASE()'
)
->
fetchColumn
();
}
}
}
}
\ No newline at end of file
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