Disable mongoc_client reuse between connections

mongodb · Nov 7, 2024 · fac968a · fac968a
1 parent c0d2635
commit fac968a
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/src/Connection.php b/src/Connection.php
@@ -217,6 +217,10 @@ protected function createConnection(string $dsn, array $config, array $options):
             $options['password'] = $config['password'];
         }
 
+        if (isset($config['name'])) {
+            $driverOptions += ['connectionName' => $config['name']];
+        }
+
         return new Client($dsn, $options, $driverOptions);
     }
 

diff --git a/tests/ConnectionTest.php b/tests/ConnectionTest.php
@@ -277,6 +277,34 @@ public function testQueryLog()
         }
     }
 
+    public function testQueryLogWithMultipleClients()
+    {
+        $connection = DB::connection('mongodb');
+        $this->assertInstanceOf(Connection::class, $connection);
+
+        // Create a second connection with the same config as the first
+        // Make sure to change the name as it's used as a connection identifier
+        $config = $connection->getConfig();
+        $config['name'] = 'mongodb2';
+        $secondConnection = new Connection($config);
+
+        $connection->enableQueryLog();
+        $secondConnection->enableQueryLog();
+
+        $this->assertCount(0, $connection->getQueryLog());
+        $this->assertCount(0, $secondConnection->getQueryLog());
+
+        $connection->table('items')->get();
+
+        $this->assertCount(1, $connection->getQueryLog());
+        $this->assertCount(0, $secondConnection->getQueryLog());
+
+        $secondConnection->table('items')->get();
+
+        $this->assertCount(1, $connection->getQueryLog());
+        $this->assertCount(1, $secondConnection->getQueryLog());
+    }
+
     public function testDisableQueryLog()
     {
         // Disabled by default