Merge branch 'master' into pr_1145

Author: Giacomo Fabbian

composer.json

@@ -23,15 +23,15 @@
         "illuminate/container": "^5.8|^6.0",
         "illuminate/database": "^5.8|^6.0",
         "illuminate/events": "^5.8|^6.0",
-        "mongodb/mongodb": "^1.4",
-        "cedx/coveralls": "^11.2"
+        "mongodb/mongodb": "^1.4"
     },
     "require-dev": {
         "phpunit/phpunit": "^6.0|^7.0|^8.0",
         "orchestra/testbench": "^3.1|^4.0",
         "mockery/mockery": "^1.0",
         "doctrine/dbal": "^2.5",
-        "phpunit/phpcov": "^6.0"
+        "phpunit/phpcov": "^6.0",
+        "cedx/coveralls": "^11.2"
     },
     "autoload": {
         "psr-0": {

src/Jenssegers/Mongodb/Connection.php

@@ -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();
 
@@ -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