fixes directoryExists - directory name was prefixed for file not directory

fixes exists - not working properly for checking directories
fixes writeStream - updating size not working for SqlServer
fixes delete - file name was not prefixed
fixes listContents - prefixed path was not fully working
change exists - not working propery under SqlServer
change writeStream - on exception file name in message was prefixed

Author: trusek

src/DoctrineDBALAdapter.php

@@ -5,6 +5,7 @@
 use DateTimeImmutable;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\ParameterType;
+use Doctrine\DBAL\Platforms\SQLServerPlatform;
 use Doctrine\DBAL\Types\Types;
 use League\Flysystem\Config;
 use League\Flysystem\DirectoryAttributes;
@@ -78,23 +79,23 @@ public function fileExists(string $path): bool
 
     public function directoryExists(string $path): bool
     {
-        return $this->exists($this->prefixer->prefixPath($path), self::TYPE_DIR);
+        return $this->exists($this->prefixer->prefixDirectoryPath($path), self::TYPE_DIR);
     }
 
     private function exists(string $prefixedPath, string $type): bool
     {
         return (bool) $this->connection->executeQuery(<<<SQL
-SELECT EXISTS (
+SELECT CASE WHEN EXISTS (
     SELECT
         1
     FROM {$this->table}
     WHERE
         path = :path AND
         type = :type
-)
+) THEN 1 ELSE 0 END
 SQL,
             [
-                'path' => $prefixedPath,
+                'path' => rtrim($prefixedPath, '\\/'),
                 'type' => $type,
             ],
             [
@@ -116,9 +117,6 @@ public function write(string $path, string $contents, Config $config): void
         $this->writeStream($path, $resource, $config);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function writeStream(string $path, $contents, Config $config): void
     {
         try {
@@ -130,31 +128,31 @@ public function writeStream(string $path, $contents, Config $config): void
              * UPDATE if file exists
              * INSERT if not
              */
+            $pathPrefixed = $this->prefixer->prefixPath($path);
             if ($this->fileExists($path)) {
-                $path = $this->prefixer->prefixPath($path);
                 $this->connection->update($this->table,
                     [
                         'contents' => $contents,
                         'timestamp' => $config->get('timestamp', time()),
                         'visibility' => $config->get(Config::OPTION_VISIBILITY, Visibility::PUBLIC),
                     ],
                     [
-                        'path' => $path,
+                        'path' => $pathPrefixed,
                     ],
                     [
                         'contents' => Types::BINARY,
                         'timestamp' => Types::INTEGER,
-                    ]);
+                    ]
+                );
             } else {
-                $path = $this->prefixer->prefixPath($path);
                 /* @var int|string $timestamp */
                 $this->connection->insert($this->table, [
-                    'path' => $path,
+                    'path' => $pathPrefixed,
                     'type' => self::TYPE_FILE,
                     'timestamp' => $config->get('timestamp', time()),
-                    'level' => $this->directoryLevel($path),
+                    'level' => $this->directoryLevel($pathPrefixed),
                     'contents' => $contents,
-                    'mimetype' => $this->mimeTypeDetector->detectMimeType($path, $contents),
+                    'mimetype' => $this->mimeTypeDetector->detectMimeType($pathPrefixed, $contents),
                     'visibility' => $config->get(Config::OPTION_VISIBILITY, Visibility::PUBLIC),
                 ], [
                     'path' => ParameterType::STRING,
@@ -167,16 +165,23 @@ public function writeStream(string $path, $contents, Config $config): void
                 ]);
             }
 
-            $this->connection->executeStatement(<<<SQL
+            if ($this->connection->getDatabasePlatform() instanceof SQLServerPlatform) {
+                $lengthFnName = 'LEN';
+            } else {
+                $lengthFnName = 'LENGTH';
+            }
+
+            $this->connection->executeStatement(
+                <<<SQL
 UPDATE
     {$this->table}
 SET
-    size = LENGTH(contents)
+    size = {$lengthFnName}(contents)
 WHERE
     path = :path
 SQL,
                 [
-                    'path' => $path,
+                    'path' => $pathPrefixed,
                 ],
                 [
                     'path' => ParameterType::STRING,
@@ -210,9 +215,6 @@ public function read(string $path): string
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     public function readStream(string $path): mixed
     {
         try {
@@ -254,7 +256,7 @@ public function delete(string $path): void
                 ->delete(
                     $this->table,
                     [
-                        'path' => $path,
+                        'path' => $this->prefixer->prefixPath($path),
                         'type' => self::TYPE_FILE,
                     ],
                 );
@@ -402,7 +404,8 @@ public function fileSize(string $path): FileAttributes
 
     public function listContents(string $path, bool $deep): iterable
     {
-        $path = $this->prefixer->prefixPath($path);
+        $prefixedPath = $this->prefixer->prefixPath($path);
+        $fixedPathForQuery = rtrim($prefixedPath, '\\/');
 
         try {
             $queryBuilder = $this->connection->createQueryBuilder()
@@ -415,25 +418,39 @@ public function listContents(string $path, bool $deep): iterable
                 $queryBuilder
                     ->andWhere(
                         $expressionBuilder->or(
-                            $expressionBuilder->eq('path', $queryBuilder->createNamedParameter($path)),
-                            $expressionBuilder->like('path', $queryBuilder->createNamedParameter($path.'/%'))
+                            $expressionBuilder->eq('path', $queryBuilder->createNamedParameter($fixedPathForQuery)),
+                            $expressionBuilder->like('path', $queryBuilder->createNamedParameter($fixedPathForQuery.'/%'))
                         )
                     );
                 if ($deep) {
                     $queryBuilder->andWhere(
-                        'level >= '.$queryBuilder->createNamedParameter($this->directoryLevel($path) + 1,
+                        'level >= '.$queryBuilder->createNamedParameter($this->directoryLevel($fixedPathForQuery) + 1,
                             ParameterType::INTEGER),
                     );
                 } else {
                     $queryBuilder->andWhere(
-                        'level = '.$queryBuilder->createNamedParameter($this->directoryLevel($path) + 1,
+                        'level = '.$queryBuilder->createNamedParameter($this->directoryLevel($fixedPathForQuery) + 1,
                             ParameterType::INTEGER),
                     );
                 }
-            } else {
+            } elseif (!empty($prefixedPath)) {
+                $expressionBuilder = $this->connection->createExpressionBuilder();
+
+                $queryBuilder
+                    ->andWhere(
+                        $expressionBuilder->or(
+                            $expressionBuilder->eq('path', $queryBuilder->createNamedParameter($fixedPathForQuery)),
+                            $expressionBuilder->like('path', $queryBuilder->createNamedParameter($fixedPathForQuery.'/%'))
+                        )
+                    );
                 if (!$deep) {
-                    $queryBuilder->andWhere('level = 0');
+                    $queryBuilder->andWhere('level = 1');
+                } else {
+                    // exclude prefix directory
+                    $queryBuilder->andWhere('level != 0');
                 }
+            } elseif (!$deep) {
+                $queryBuilder->andWhere('level = 0');
             }
             $queryBuilder->orderBy('path', 'ASC');
 

tests/DoctrineDBALAdapterTest.php

@@ -22,6 +22,6 @@ protected static function createFilesystemAdapter(): FilesystemAdapter
 
         $connection->executeStatement((string) file_get_contents(dirname(__DIR__).'/schema/sqlite.sql'));
 
-        return new DoctrineDBALAdapter($connection);
+        return new DoctrineDBALAdapter(connection: $connection);
     }
 }

tests/DoctrineDBALAdapterWithPrefixTest.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace WGG\Flysystem\Doctrine\Tests;
+
+use Doctrine\DBAL\DriverManager;
+use League\Flysystem\AdapterTestUtilities\FilesystemAdapterTestCase;
+use League\Flysystem\FilesystemAdapter;
+use WGG\Flysystem\Doctrine\DoctrineDBALAdapter;
+
+use function dirname;
+
+/**
+ * @covers \WGG\Flysystem\Doctrine\DoctrineDBALAdapter
+ */
+class DoctrineDBALAdapterWithPrefixTest extends FilesystemAdapterTestCase
+{
+    protected static function createFilesystemAdapter(): FilesystemAdapter
+    {
+        $connection = DriverManager::getConnection([
+            'url' => 'sqlite:///:memory:',
+        ]);
+
+        $connection->executeStatement((string) file_get_contents(dirname(__DIR__).'/schema/sqlite.sql'));
+
+        return new DoctrineDBALAdapter(connection: $connection, prefix: 'prefix_test');
+    }
+}