Skip to content

[Updated PR#1491] Gets database name from DSN string #1954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Feb 10, 2020
Merged

[Updated PR#1491] Gets database name from DSN string #1954

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
459d7e8
applied pull request https://github.com/jenssegers/laravel-mongodb/pu…
hlorofos Apr 19, 2018
e1e95a5
get database from DSN string
hlorofos Apr 19, 2018
068a0af
bugfix: improper database configuration values used
hlorofos Apr 19, 2018
76a5dbc
bugfix: failover to database configuration values if no ability to ge…
hlorofos Apr 19, 2018
929120f
bugfix: failover to database configuration values if no ability to ge…
hlorofos Apr 19, 2018
1ffc7a2
Merge branch 'pr_1491' into pr/17
divine Feb 9, 2020
5cb9a01
Remove duplicate dsn
divine Feb 9, 2020
d0c7b4d
Merge pull request #18 from divine/pr/17
divine Feb 9, 2020
0f5b177
Merge branch 'master' into pr_1491
divine Feb 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/Jenssegers/Mongodb/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function __construct(array $config)
$this->connection = $this->createConnection($dsn, $config, $options);

// Select database
$this->db = $this->connection->selectDatabase($config['database']);
$this->db = $this->connection->selectDatabase($this->getDatabaseDsn($dsn, $config['database']));

$this->useDefaultPostProcessor();

Expand Down Expand Up @@ -188,10 +188,21 @@ protected function getHostDsn(array $config)

// Check if we want to authenticate against a specific database.
$auth_database = isset($config['options']) && !empty($config['options']['database']) ? $config['options']['database'] : null;

return 'mongodb://' . implode(',', $hosts) . ($auth_database ? '/' . $auth_database : '');
}

/**
* Get database name from DSN string, if there is no database in DSN path - returns back $database argument.
* @param string $dsn
* @param $database
* @return string
*/
protected function getDatabaseDsn($dsn, $database)
{
$dsnDatabase = trim(parse_url($dsn, PHP_URL_PATH), '/');
return trim($dsnDatabase) ? $dsnDatabase : $database;
}

/**
* Create a DSN string from a configuration.
* @param array $config
Expand Down