wrap normal run statements in actual one off transactions

references #64

Author: transistive

docker-compose.yml

@@ -24,6 +24,8 @@ services:
             - readreplica1
         expose:
             - 9000
+        env_file:
+          - .env
     neo4j:
         networks:
             - neo4j
@@ -42,6 +44,9 @@ services:
         environment:
             - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes
             - NEO4J_AUTH=neo4j/test
+            - NEO4J_dbms_security_allow__csv__import__from__file__urls=true
+        volumes:
+          - ./tests/resources:/import
     core1:
         image: neo4j:4.3-enterprise
         healthcheck:
@@ -60,6 +65,8 @@ services:
         ports:
             - "7475:7474"
             - "7688:7687"
+        volumes:
+          - ./tests/resources:/import
         environment:
             - NEO4J_ACCEPT_LICENSE_AGREEMENT=yes
             - NEO4J_AUTH=neo4j/test
@@ -70,6 +77,7 @@ services:
             - NEO4J_causalClustering_initialDiscoveryMembers=core1:5000,core2:5000,core3:5000
             - NEO4J_causal__clustering_disable__middleware__logging=false
             - NEO4J_dbms_connectors_default__advertised__address=core1
+            - NEO4J_dbms_security_allow__csv__import__from__file__urls=true
     core2:
         image: neo4j:4.3-enterprise
         healthcheck:
@@ -94,6 +102,9 @@ services:
             - NEO4J_causalClustering_raftAdvertisedAddress=core2:7000
             - NEO4J_causalClustering_initialDiscoveryMembers=core1:5000,core2:5000,core3:5000
             - NEO4J_dbms_connectors_default__advertised__address=core2
+            - NEO4J_dbms_security_allow__csv__import__from__file__urls=true
+        volumes:
+          - ./tests/resources:/import
 
     core3:
         image: neo4j:4.3-enterprise
@@ -119,6 +130,9 @@ services:
             - NEO4J_causalClustering_raftAdvertisedAddress=core3:7000
             - NEO4J_causalClustering_initialDiscoveryMembers=core1:5000,core2:5000,core3:5000
             - NEO4J_dbms_connectors_default__advertised__address=core3
+            - NEO4J_dbms_security_allow__csv__import__from__file__urls=true
+        volumes:
+          - ./tests/resources:/import
 
     readreplica1:
         image: neo4j:4.3-enterprise
@@ -144,3 +158,6 @@ services:
             - NEO4J_causalClustering_raftAdvertisedAddress=readreplica1:7000
             - NEO4J_causalClustering_initialDiscoveryMembers=core1:5000,core2:5000,core3:5000
             - NEO4J_dbms_connectors_default__advertised__address=readreplica1
+            - NEO4J_dbms_security_allow__csv__import__from__file__urls=true
+        volumes:
+          - ./tests/resources:/import

src/Bolt/Session.php

@@ -23,6 +23,7 @@
 use Laudis\Neo4j\Contracts\ConnectionPoolInterface;
 use Laudis\Neo4j\Contracts\FormatterInterface;
 use Laudis\Neo4j\Contracts\SessionInterface;
+use Laudis\Neo4j\Contracts\TransactionInterface;
 use Laudis\Neo4j\Contracts\UnmanagedTransactionInterface;
 use Laudis\Neo4j\Databags\Neo4jError;
 use Laudis\Neo4j\Databags\SessionConfiguration;
@@ -70,7 +71,7 @@ public function __construct(
 
     public function runStatements(iterable $statements, ?TransactionConfiguration $config = null): CypherList
     {
-        return $this->openTransaction()->commit($statements);
+        return $this->beginInstantTransaction()->runStatements($statements);
     }
 
     public function openTransaction(iterable $statements = null, ?TransactionConfiguration $config = null): UnmanagedTransactionInterface
@@ -110,8 +111,7 @@ public function transaction(callable $tsxHandler, ?TransactionConfiguration $con
     public function beginTransaction(?iterable $statements = null, ?TransactionConfiguration $config = null): UnmanagedTransactionInterface
     {
         try {
-            $bolt = new Bolt($this->pool->acquire($this->uri, $this->config->getAccessMode(), $this->auth));
-            $this->auth->authenticateBolt($bolt, $this->uri, $this->userAgent);
+            $bolt = $this->acquireBolt();
 
             $begin = $bolt->begin(['db' => $this->config->getDatabase()]);
 
@@ -131,4 +131,20 @@ public function beginTransaction(?iterable $statements = null, ?TransactionConfi
 
         return $tsx;
     }
+
+    /**
+     * @return UnmanagedTransactionInterface<T>
+     */
+    private function beginInstantTransaction(): TransactionInterface
+    {
+        return new BoltUnmanagedTransaction($this->config->getDatabase(), $this->formatter, $this->acquireBolt());
+    }
+
+    private function acquireBolt(): Bolt
+    {
+        $bolt = new Bolt($this->pool->acquire($this->uri, $this->config->getAccessMode(), $this->auth));
+        $this->auth->authenticateBolt($bolt, $this->uri, $this->userAgent);
+
+        return $bolt;
+    }
 }

tests/Integration/BoltDriverIntegrationTest.php

@@ -13,9 +13,9 @@
 
 namespace Laudis\Neo4j\Tests\Integration;
 
+use Bolt\error\ConnectException;
 use Exception;
 use Laudis\Neo4j\Bolt\BoltDriver;
-use Laudis\Neo4j\Exception\Neo4jException;
 use PHPUnit\Framework\TestCase;
 
 final class BoltDriverIntegrationTest extends TestCase
@@ -49,7 +49,7 @@ public function testValidUrl(): void
     public function testInvalidIp(): void
     {
         $driver = BoltDriver::create('bolt://neo4j:[email protected]');
-        $this->expectException(Neo4jException::class);
+        $this->expectException(ConnectException::class);
         $driver->createSession()->run('RETURN 1');
     }
 
@@ -59,7 +59,7 @@ public function testInvalidIp(): void
     public function testInvalidSocket(): void
     {
         $driver = BoltDriver::create('bolt://neo4j:[email protected]');
-        $this->expectException(Neo4jException::class);
+        $this->expectException(ConnectException::class);
         $driver->createSession()->run('RETURN 1');
     }
 }

tests/Integration/ComplexQueryTests.php

@@ -14,6 +14,7 @@
 namespace Laudis\Neo4j\Tests\Integration;
 
 use Generator;
+use function getenv;
 use InvalidArgumentException;
 use Laudis\Neo4j\Contracts\FormatterInterface;
 use Laudis\Neo4j\Formatter\BasicFormatter;
@@ -218,4 +219,23 @@ public function testPathReturnType(string $alias): void
             ['x' => 'z'],
         ], $result->get('p'));
     }
+
+    /**
+     * @dataProvider connectionAliases
+     */
+    public function testPeriodicCommit(string $alias): void
+    {
+        if (getenv('TESTING_ENVIRONMENT') !== 'local') {
+            self::markTestSkipped('Only local environment has access to local files');
+        }
+
+        $this->client->run(<<<CYPHER
+USING PERIODIC COMMIT 10
+LOAD CSV FROM 'file:///csv-example.csv' AS line
+MERGE (n:File {name: line[0]});
+CYPHER, [], $alias);
+
+        $result = $this->client->run('MATCH (n:File) RETURN count(n) AS count');
+        self::assertEquals(20, $result->first()->get('count'));
+    }
 }

tests/resources/csv-example.csv

@@ -0,0 +1,20 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20