work in progress

Author: p123-stack

src/Bolt/BoltConnection.php

@@ -223,7 +223,9 @@ private function prepareForBegin(): void
      */
     public function begin(?string $database, ?float $timeout, BookmarkHolder $holder, ?array $txMetaData): void
     {
-        $extra = $this->buildRunExtra($database, $timeout, $holder, null, $txMetaData, true);
+        $this->consumeResults();
+
+        $extra = $this->buildRunExtra($database, $timeout, $holder, $this->getAccessMode(), $txMetaData);
         $message = $this->messageFactory->createBeginMessage($extra);
         $response = $message->send()->getResponse();
         $this->assertNoFailure($response);
@@ -372,6 +374,7 @@ private function buildRunExtra(?string $database, ?float $timeout, BookmarkHolde
                     $extra['tx_metadata'] = $metadataArray;
                 }
             }
+
         }
 
         return $extra;

src/Databags/TransactionConfiguration.php

@@ -67,6 +67,15 @@ public function getTimeout(): ?float
     {
         return $this->timeout;
     }
+    /**
+     * Get the configured bookmarks for causal consistency.
+     *
+     * @return array<string>|null
+     */
+    public function getBookmarks(): ?array
+    {
+        return $this->bookmarks;
+    }
 
     /**
      * Creates a new transaction object with the provided timeout.

testkit-backend/src/Handlers/SessionReadTransaction.php

@@ -52,6 +52,10 @@ public function handle($request): TestkitResponseInterface
             $config = $config->withMetaData($request->getTxMeta());
         }
 
+        if ($request->getBookmarks()) {
+            $config = $config->withBookmarks($request->getBookmarks());
+        }
+
         $id = Uuid::v4();
         try {
             // TODO - Create beginReadTransaction and beginWriteTransaction

testkit-backend/src/Requests/SessionBeginTransactionRequest.php

@@ -48,7 +48,7 @@ public function getTxMeta(): iterable
         return $this->txMeta ?? [];
     }
 
-    public function getTimeout(): ?int
+    public function getTimeout(): int|null
     {
         return $this->timeout;
     }

testkit-backend/src/Requests/SessionReadTransactionRequest.php

@@ -21,6 +21,8 @@ final class SessionReadTransactionRequest
     /** @var iterable<string, array|scalar|null> */
     private iterable $txMeta;
     private ?int $timeout;
+    private array $bookmarks; // ADD THIS
+
 
     /**
      * @param iterable<string, array|scalar|null>|null $txMeta
@@ -29,10 +31,14 @@ public function __construct(
         Uuid $sessionId,
         ?iterable $txMeta = null,
         ?int $timeout = null,
+        array $bookmarks = [] // ADD THIS
+
     ) {
         $this->sessionId = $sessionId;
         $this->txMeta = $txMeta ?? [];
         $this->timeout = $timeout;
+        $this->bookmarks = $bookmarks; // ADD THIS
+
     }
 
     public function getSessionId(): Uuid
@@ -52,4 +58,9 @@ public function getTimeout(): ?int
     {
         return $this->timeout;
     }
+
+    public function getBookmarks(): array // ADD THIS
+    {
+        return $this->bookmarks;
+    }
 }

testkit-backend/testkit.sh

@@ -81,6 +81,22 @@ EXIT_CODE=0
 #python3 -m unittest tests.stub.basic_query.test_basic_query.TestBasicQuery.test_4x4_populates_path_element_ids_with_long
 
 
+#bookmarks
+#TestBookmarksV4
+#python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_bookmarks_on_unused_sessions_are_returned #fixed
+#python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_bookmarks_session_run #fixed
+#python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_bookmarks_tx_run #fixed
+#python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_sequence_of_writing_and_reading_tx
+
+#TestBookmarksV5
+##
+#python3 -m unittest tests.stub.bookmarks.test_bookmarks_v5.TestBookmarksV5.test_bookmarks_can_be_set # fixed
+#python3 -m unittest tests.stub.bookmarks.test_bookmarks_v5.TestBookmarksV5.test_last_bookmark #fixed
+python3 -m unittest tests.stub.bookmarks.test_bookmarks_v5.TestBookmarksV5.test_send_and_receive_bookmarks_read_tx #fixed
+#python3 -m unittest tests.stub.bookmarks.test_bookmarks_v5.TestBookmarksV5.test_send_and_receive_bookmarks_write_tx
+#python3 -m unittest tests.stub.bookmarks.test_bookmarks_v5.TestBookmarksV5.test_sequence_of_writing_and_reading_tx
+#python3 -m unittest tests.stub.bookmarks.test_bookmarks_v5.TestBookmarksV5.test_send_and_receive_multiple_bookmarks_write_tx
+
 #test-session-run
 #python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_discard_on_session_close_untouched_result
 #python3 -m unittest tests.stub.session_run.test_session_run.TestSessionRun.test_discard_on_session_close_unfinished_result
@@ -89,10 +105,10 @@ EXIT_CODE=0
 
 #bookmarks
 #TestBookmarksV4
-python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_bookmarks_on_unused_sessions_are_returned
-python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_bookmarks_session_run
-python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_bookmarks_tx_run
-python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_sequence_of_writing_and_reading_tx
+#python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_bookmarks_on_unused_sessions_are_returned
+#python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_bookmarks_session_run
+#python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_bookmarks_tx_run
+#python3 -m unittest tests.stub.bookmarks.test_bookmarks_v4.TestBookmarksV4.test_sequence_of_writing_and_reading_tx
 
 exit $EXIT_CODE
 

tests/Integration/ComplexQueryTest.php

@@ -13,6 +13,8 @@
 
 namespace Laudis\Neo4j\Tests\Integration;
 
+use Bolt\error\ConnectionTimeoutException;
+use Exception;
 use Generator;
 
 use function getenv;
@@ -266,16 +268,37 @@ public function testDiscardAfterTimeout(): void
             $this->markTestSkipped('Memory bug in CI');
         }
 
+        // First, let's debug what timeout value is actually being sent
+        $config = TransactionConfiguration::default()->withTimeout(2);
+        echo "Config timeout: " . $config->getTimeout() . " seconds\n";
+
         try {
-            $this->getSession(['bolt', 'neo4j'])
-                ->run('CALL apoc.util.sleep(3000) RETURN 5 as x', [], TransactionConfiguration::default()->withTimeout(2))
-                ->first()
-                ->get('x');
+            $result = $this->getSession(['bolt', 'neo4j'])
+                ->run('CALL apoc.util.sleep(5000) RETURN 5 as x', [], $config);
+
+            echo "Query started, attempting to get first result...\n";
+            $firstResult = $result->first();
+            echo "Got first result, attempting to get 'x' value...\n";
+            $value = $firstResult->get('x');
+            echo "Successfully got value: " . $value . "\n";
+
+            // If we reach here, no timeout occurred
+            $this->fail('Query completed successfully - no timeout occurred. This suggests the timeout is not being applied correctly.');
+
         } catch (Neo4jException $e) {
+            echo "Neo4jException caught: " . $e->getMessage() . "\n";
+            echo "Neo4j Code: " . $e->getNeo4jCode() . "\n";
             self::assertStringContainsString('Neo.ClientError.Transaction.TransactionTimedOut', $e->getNeo4jCode());
+
+        } catch (ConnectionTimeoutException $e) {
+            echo "ConnectionTimeoutException: " . $e->getMessage() . "\n";
+            $this->fail('Connection timeout occurred instead of transaction timeout');
+
+        } catch (Exception $e) {
+            echo "Other exception: " . get_class($e) . " - " . $e->getMessage() . "\n";
+            throw $e; // Re-throw for debugging
         }
     }
-
     public function testTimeoutNoReturn(): void
     {
         $result = $this->getSession(['bolt', 'neo4j'])