Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
L
laravel-mongodb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
sinan
laravel-mongodb
Commits
76a5dbc8
Commit
76a5dbc8
authored
Apr 19, 2018
by
Oleg Khimich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix: failover to database configuration values if no ability to get database from DSN
parent
068a0af2
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
Connection.php
src/Jenssegers/Mongodb/Connection.php
+5
-4
No files found.
src/Jenssegers/Mongodb/Connection.php
View file @
76a5dbc8
...
@@ -41,7 +41,7 @@ class Connection extends BaseConnection
...
@@ -41,7 +41,7 @@ class Connection extends BaseConnection
$this
->
connection
=
$this
->
createConnection
(
$dsn
,
$config
,
$options
);
$this
->
connection
=
$this
->
createConnection
(
$dsn
,
$config
,
$options
);
// Select database
// Select database
$this
->
db
=
$this
->
connection
->
selectDatabase
(
$this
->
getDatabaseDsn
(
$dsn
));
$this
->
db
=
$this
->
connection
->
selectDatabase
(
$this
->
getDatabaseDsn
(
$dsn
,
$config
[
'database'
]
));
$this
->
useDefaultPostProcessor
();
$this
->
useDefaultPostProcessor
();
...
@@ -190,7 +190,7 @@ class Connection extends BaseConnection
...
@@ -190,7 +190,7 @@ class Connection extends BaseConnection
}
}
// Check if we want to authenticate against a specific database.
// Check if we want to authenticate against a specific database.
$auth_database
=
isset
(
$config
[
'
database'
])
&&
!
empty
(
$config
[
'database'
])
?
$config
[
'database'
]
:
null
;
$auth_database
=
isset
(
$config
[
'
options'
])
&&
!
empty
(
$config
[
'options'
][
'database'
])
?
$config
[
'options'
]
[
'database'
]
:
null
;
return
'mongodb://'
.
implode
(
','
,
$hosts
)
.
(
$auth_database
?
'/'
.
$auth_database
:
''
);
return
'mongodb://'
.
implode
(
','
,
$hosts
)
.
(
$auth_database
?
'/'
.
$auth_database
:
''
);
}
}
...
@@ -199,9 +199,10 @@ class Connection extends BaseConnection
...
@@ -199,9 +199,10 @@ class Connection extends BaseConnection
* @param string $dsn
* @param string $dsn
* @return string
* @return string
*/
*/
protected
function
getDatabaseDsn
(
$dsn
)
protected
function
getDatabaseDsn
(
$dsn
,
$database
)
{
{
return
trim
(
parse_url
(
$dsn
,
PHP_URL_PATH
),
'/'
);
$dsnDatabase
=
trim
(
parse_url
(
$dsn
,
PHP_URL_PATH
),
'/'
);
return
$dsnDatabase
?:
$database
;
}
}
/**
/**
...
...
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