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
3c6dbfce
Commit
3c6dbfce
authored
Jan 03, 2015
by
Steve Müller
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #712 from mikeSimonson/fix-dbname-mysqli
Backporting a fix to allow connection without dbname
parents
81591fd4
4ae4b93d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
MysqliConnection.php
lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
+2
-1
No files found.
lib/Doctrine/DBAL/Driver/Mysqli/MysqliConnection.php
View file @
3c6dbfce
...
@@ -43,9 +43,10 @@ class MysqliConnection implements Connection
...
@@ -43,9 +43,10 @@ class MysqliConnection implements Connection
{
{
$port
=
isset
(
$params
[
'port'
])
?
$params
[
'port'
]
:
ini_get
(
'mysqli.default_port'
);
$port
=
isset
(
$params
[
'port'
])
?
$params
[
'port'
]
:
ini_get
(
'mysqli.default_port'
);
$socket
=
isset
(
$params
[
'unix_socket'
])
?
$params
[
'unix_socket'
]
:
ini_get
(
'mysqli.default_socket'
);
$socket
=
isset
(
$params
[
'unix_socket'
])
?
$params
[
'unix_socket'
]
:
ini_get
(
'mysqli.default_socket'
);
$dbname
=
isset
(
$params
[
'dbname'
])
?
$params
[
'dbname'
]
:
null
;
$this
->
_conn
=
mysqli_init
();
$this
->
_conn
=
mysqli_init
();
if
(
!
$this
->
_conn
->
real_connect
(
$params
[
'host'
],
$username
,
$password
,
$
params
[
'dbname'
]
,
$port
,
$socket
))
{
if
(
!
$this
->
_conn
->
real_connect
(
$params
[
'host'
],
$username
,
$password
,
$
dbname
,
$port
,
$socket
))
{
throw
new
MysqliException
(
$this
->
_conn
->
connect_error
,
$this
->
_conn
->
connect_errno
);
throw
new
MysqliException
(
$this
->
_conn
->
connect_error
,
$this
->
_conn
->
connect_errno
);
}
}
...
...
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