fix pgsql/mssql/oracle missing quote

Author: mvorisek

phpstan.neon.dist

@@ -32,9 +32,9 @@ parameters:
 
         # fix https://github.com/phpstan/phpstan-deprecation-rules/issues/52 and https://github.com/phpstan/phpstan/issues/6444
         -
-            message: '~^Call to method (getVarcharTypeDeclarationSQL|getClobTypeDeclarationSQL|getCreateTableSQL)\(\) of deprecated class Doctrine\\DBAL\\Platforms\\(SQLServerPlatform|AbstractPlatform):\nUse.+instead\.$~'
+            message: '~^Call to method (getVarcharTypeDeclarationSQL|getClobTypeDeclarationSQL|getCreateTableSQL|getCurrentDatabaseExpression)\(\) of deprecated class Doctrine\\DBAL\\Platforms\\(PostgreSQLPlatform|SQLServerPlatform|AbstractPlatform):\nUse.+instead\.$~'
             path: '*'
-            count: 3
+            count: 5
 
         # TODO these rules are generated, this ignores should be fixed in the code
         # for src/Schema/TestCase.php

src/Schema/Migrator.php

@@ -11,11 +11,14 @@
 use Atk4\Data\Persistence;
 use Atk4\Data\Persistence\Sql\Connection;
 use Atk4\Data\Reference\HasOne;
+use Doctrine\DBAL\Driver\Exception as DbalDriverException;
+use Doctrine\DBAL\Exception\DatabaseObjectNotFoundException;
 use Doctrine\DBAL\Exception\TableNotFoundException;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Platforms\OraclePlatform;
 use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Platforms\SQLServerPlatform;
 use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\Table;
 
@@ -107,8 +110,19 @@ public function create(): self
 
     public function drop(): self
     {
-        $this->createSchemaManager()
-            ->dropTable($this->getDatabasePlatform()->quoteIdentifier($this->table->getName()));
+        try {
+            $this->createSchemaManager()
+                ->dropTable($this->getDatabasePlatform()->quoteIdentifier($this->table->getName()));
+        } catch (DatabaseObjectNotFoundException $e) {
+            // fix exception not converted to TableNotFoundException for MSSQL
+            // https://github.com/doctrine/dbal/pull/5492
+            if ($this->getDatabasePlatform() instanceof SQLServerPlatform && $e->getPrevious() instanceof DbalDriverException
+                && preg_match('~[cC]annot drop the table \'.*\', because it does not exist or you do not have permission\.~', $e->getMessage())) {
+                throw new TableNotFoundException($e->getPrevious(), $e->getQuery());
+            }
+
+            throw $e;
+        }
 
         $this->createdTableNames = array_diff($this->createdTableNames, [$this->table->getName()]);
 

tests/RandomTest.php

@@ -567,7 +567,7 @@ public function testTableWithSchema(): void
             $runWithDb = false;
         } else {
             $dbSchema = $this->db->getConnection()->dsql()
-                ->field(new Expression($this->getDatabasePlatform()->getCurrentDatabaseExpression(true)))
+                ->field(new Expression($this->getDatabasePlatform()->getCurrentDatabaseExpression(true))) // @phpstan-ignore-line
                 ->getOne();
             $userSchema = $dbSchema;
             $docSchema = $dbSchema;

tests/Schema/MigratorTest.php

@@ -14,6 +14,7 @@
 use Doctrine\DBAL\Platforms\OraclePlatform;
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Platforms\SQLServerPlatform;
+use Doctrine\DBAL\Schema\Identifier as DbalIdentifier;
 
 class MigratorTest extends TestCase
 {
@@ -35,7 +36,14 @@ protected function createDemoMigrator(string $table): Migrator
 
     protected function isTableExist(string $table): bool
     {
-        return $this->createSchemaManager()->tablesExist([$table]);
+        foreach ($this->createSchemaManager()->listTableNames() as $v) {
+            $vUnquoted = (new DbalIdentifier($v))->getName();
+            if ($vUnquoted === $table) {
+                return true;
+            }
+        }
+
+        return false;
     }
 
     public function testCreate(): void