removed recreation of bolt connection

Author: transistive

src/Bolt/BoltConnection.php

@@ -17,6 +17,7 @@
 use Bolt\error\MessageException;
 use Bolt\protocol\V3;
 use Bolt\protocol\V4;
+use function in_array;
 use Laudis\Neo4j\Common\ConnectionConfiguration;
 use Laudis\Neo4j\Contracts\AuthenticateInterface;
 use Laudis\Neo4j\Contracts\ConnectionInterface;
@@ -244,7 +245,7 @@ public function discard(?int $qid): void
      */
     public function run(string $text, array $parameters, ?string $database, ?float $timeout, BookmarkHolder $holder): array
     {
-        if (!str_starts_with($this->serverState, 'TX_') || str_starts_with($this->getServerVersion(), '3')) {
+        if (in_array($this->serverState, ['STREAMING', 'TX_STREAMING'])) {
             $this->consumeResults();
         }
 

src/Bolt/BoltResult.php

@@ -13,11 +13,11 @@
 
 namespace Laudis\Neo4j\Bolt;
 
-use Laudis\Neo4j\Contracts\FormatterInterface;
 use function array_splice;
 use function count;
 use Generator;
 use Iterator;
+use Laudis\Neo4j\Contracts\FormatterInterface;
 
 /**
  * @psalm-import-type BoltCypherStats from FormatterInterface

src/Bolt/ConnectionPool.php

@@ -109,11 +109,6 @@ public function release(ConnectionInterface $connection): void
         }
     }
 
-    public function __destruct()
-    {
-        echo 'Destructing connection pool';
-    }
-
     /**
      * @return BoltConnection|null
      */
@@ -122,12 +117,12 @@ private function returnAnyAvailableConnection(SessionConfiguration $config): ?Co
         $streamingConnection = null;
         $requiresReconnectConnection = null;
         // Ensure random connection reuse before picking one.
-//        shuffle($this->activeConnections);
+        shuffle($this->activeConnections);
 
         foreach ($this->activeConnections as $activeConnection) {
             // We prefer a connection that is just ready
             if ($activeConnection->getServerState() === 'READY') {
-                if ($this->factory->canReuseConnection($activeConnection, $this->data)) {
+                if ($this->factory->canReuseConnection($activeConnection, $this->data, $config)) {
                     return $this->factory->reuseConnection($activeConnection, $config);
                 } else {
                     $requiresReconnectConnection = $activeConnection;
@@ -142,7 +137,7 @@ private function returnAnyAvailableConnection(SessionConfiguration $config): ?Co
             // https://github.com/neo4j-php/neo4j-php-client/issues/146
             // NOTE: we cannot work with TX_STREAMING as we cannot force the transaction to implicitly close.
             if ($streamingConnection === null && $activeConnection->getServerState() === 'STREAMING') {
-                if ($this->factory->canReuseConnection($activeConnection, $this->data)) {
+                if ($this->factory->canReuseConnection($activeConnection, $this->data, $config)) {
                     $streamingConnection = $activeConnection;
                     if (method_exists($streamingConnection, 'consumeResults')) {
                         $streamingConnection->consumeResults(); // State should now be ready

src/Bolt/Session.php

@@ -194,9 +194,4 @@ public function getLastBookmark(): Bookmark
     {
         return $this->bookmarkHolder->getBookmark();
     }
-
-    public function __destruct()
-    {
-        echo 'destroyed session';
-    }
 }

src/BoltFactory.php

@@ -81,35 +81,23 @@ public function createConnection(ConnectionRequestData $data, SessionConfigurati
         return new BoltConnection($protocol, $connection, $data->getAuth(), $data->getUserAgent(), $config);
     }
 
-    public function canReuseConnection(ConnectionInterface $connection, ConnectionRequestData $data): bool
+    public function canReuseConnection(ConnectionInterface $connection, ConnectionRequestData $data, SessionConfiguration $config): bool
     {
+        $databaseInfo = $connection->getDatabaseInfo();
+        $database = $databaseInfo === null ? null : $databaseInfo->getName();
+
         return $connection->getServerAddress()->getHost() === $data->getUri()->getHost() &&
                $connection->getServerAddress()->getPort() === $data->getUri()->getPort() &&
                $connection->getAuthentication()->toString($data->getUri()) === $data->getAuth()->toString($data->getUri()) &&
                $connection->getEncryptionLevel() === $this->sslConfigurationFactory->create($data->getUri(), $data->getSslConfig())[0] &&
-               $connection->getUserAgent() === $data->getUserAgent();
+               $connection->getUserAgent() === $data->getUserAgent() &&
+            $connection->getAccessMode() === $config->getAccessMode() &&
+               $database === $config->getDatabase();
     }
 
     public function reuseConnection(BoltConnection $connection, SessionConfiguration $sessionConfig): BoltConnection
     {
-        [$protocol, $connectionImpl] = $connection->getImplementation();
-
-        $config = new ConnectionConfiguration(
-            $connection->getServerAgent(),
-            $connection->getServerAddress(),
-            $connection->getServerVersion(),
-            $connection->getProtocol(),
-            $sessionConfig->getAccessMode(),
-            $sessionConfig->getDatabase() === null ? null : new DatabaseInfo($sessionConfig->getDatabase()),
-            $connection->getEncryptionLevel()
-        );
-
-        return new BoltConnection(
-            $protocol,
-            $connectionImpl,
-            $connection->getAuthentication(),
-            $connection->getUserAgent(),
-            $config
-        );
+        // TODO make sure session config gets merged
+        return $connection;
     }
 }

tests/Integration/BasicDriverTest.php

@@ -57,6 +57,8 @@ public function testFullWalk(string $connection): void
     {
         $driver = Driver::create($connection);
 
+        global $session;
+
         $session = $driver->createSession();
 
         $session->run('MATCH (x) DETACH DELETE x');