From 400f7b6eac63cf2a1a58842d7457617bf7b8ec39 Mon Sep 17 00:00:00 2001 From: agdm Date: Wed, 7 Aug 2013 15:57:21 -0400 Subject: [PATCH 1/3] Fixed the connection string for master slave mongo db set up --- src/Jenssegers/Mongodb/Connection.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Jenssegers/Mongodb/Connection.php b/src/Jenssegers/Mongodb/Connection.php index 733d2bbdf..06d852ab6 100644 --- a/src/Jenssegers/Mongodb/Connection.php +++ b/src/Jenssegers/Mongodb/Connection.php @@ -111,20 +111,20 @@ protected function getDsn(array $config) // Treat host option as array of hosts $hosts = is_array($config['host']) ? $config['host'] : array($config['host']); - foreach ($hosts as &$host) + if (isset($config['username']) and isset($config['password'])) { - if (isset($config['username']) and isset($config['password'])) - { - $host = "{$username}:{$password}@{$host}"; - } + $credentials = "{$username}:{$password}@"; + } + foreach ($hosts as &$host) + { if (isset($config['port'])) { $host = "{$host}:{$port}"; } } - return "mongodb://" . implode(',', $hosts) . "/{$database}"; + echo "mongodb://" . $credentials . implode(',', $hosts) . "/{$database}"; } /** From c67f86ca98832100184d6fe7d288ac68132bcffd Mon Sep 17 00:00:00 2001 From: agdm Date: Wed, 7 Aug 2013 15:59:39 -0400 Subject: [PATCH 2/3] Fixed the connection string for master slave mongo db set up --- src/Jenssegers/Mongodb/Connection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Jenssegers/Mongodb/Connection.php b/src/Jenssegers/Mongodb/Connection.php index 06d852ab6..eec1fd93a 100644 --- a/src/Jenssegers/Mongodb/Connection.php +++ b/src/Jenssegers/Mongodb/Connection.php @@ -124,7 +124,7 @@ protected function getDsn(array $config) } } - echo "mongodb://" . $credentials . implode(',', $hosts) . "/{$database}"; + return "mongodb://" . $credentials . implode(',', $hosts) . "/{$database}"; } /** From 94364f45294ae8dd6becb910242993b1c53d17e9 Mon Sep 17 00:00:00 2001 From: agdm Date: Wed, 7 Aug 2013 16:42:01 -0400 Subject: [PATCH 3/3] adds a default credentials value --- src/Jenssegers/Mongodb/Connection.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Jenssegers/Mongodb/Connection.php b/src/Jenssegers/Mongodb/Connection.php index eec1fd93a..3c98ec677 100644 --- a/src/Jenssegers/Mongodb/Connection.php +++ b/src/Jenssegers/Mongodb/Connection.php @@ -111,6 +111,8 @@ protected function getDsn(array $config) // Treat host option as array of hosts $hosts = is_array($config['host']) ? $config['host'] : array($config['host']); + $credentials = null; + if (isset($config['username']) and isset($config['password'])) { $credentials = "{$username}:{$password}@";