Merge remote-tracking branch 'origin/2.17.x' into 2.18.x

doctrine · Jan 31, 2024 · 9a6ff66 · 9a6ff66
2 parents 8845b6d + f58984c
commit 9a6ff66
Show file tree

Hide file tree

Showing 10 changed files with 202 additions and 202 deletions.
diff --git a/phpstan-dbal2.neon b/phpstan-dbal2.neon
@@ -10,6 +10,8 @@ parameters:
         - '/Call to an undefined method Doctrine\\DBAL\\Connection::createSchemaManager\(\)\./'
         # Class name will change in DBAL 3.
         - '/^Class Doctrine\\DBAL\\Platforms\\PostgreSQLPlatform not found\.$/'
+        - '/^Class Doctrine\\DBAL\\Platforms\\AbstractMySQLPlatform not found\.$/'
+        - '/^Class Doctrine\\DBAL\\Platforms\\MySQLPlatform not found\.$/'
         -
             message: '/Doctrine\\DBAL\\Platforms\\MyS(ql|QL)Platform/'
             path: src/Mapping/ClassMetadataFactory.php

diff --git a/phpstan-persistence2.neon b/phpstan-persistence2.neon
@@ -27,6 +27,9 @@ parameters:
         -
             message: '/^Call to static method ensure\(\) on an unknown class Doctrine\\DBAL\\ForwardCompatibility\\Result\.$/'
             path: src/Internal/Hydration/AbstractHydrator.php
+        -
+            message: '/^Instanceof between Doctrine\\DBAL\\Platforms\\AbstractPlatform and Doctrine\\DBAL\\Platforms\\MySQLPlatform will always evaluate to false\.$/'
+            path: src/Utility/LockSqlHelper.php
 
         # False positive
         -

diff --git a/phpstan.neon b/phpstan.neon
@@ -27,6 +27,9 @@ parameters:
         -
             message: '/^Call to static method ensure\(\) on an unknown class Doctrine\\DBAL\\ForwardCompatibility\\Result\.$/'
             path: src/Internal/Hydration/AbstractHydrator.php
+        -
+            message: '/^Instanceof between Doctrine\\DBAL\\Platforms\\AbstractPlatform and Doctrine\\DBAL\\Platforms\\MySQLPlatform will always evaluate to false\.$/'
+            path: src/Utility/LockSqlHelper.php
 
         # False positive
         -

diff --git a/psalm.xml b/psalm.xml
@@ -160,6 +160,7 @@
             <errorLevel type="suppress">
                 <!-- Class name changes in DBAL 3. -->
                 <referencedClass name="Doctrine\DBAL\Platforms\PostgreSQLPlatform" />
+                <referencedClass name="Doctrine\DBAL\Platforms\MySQLPlatform" />
             </errorLevel>
         </InvalidClass>
         <InvalidParamDefault>
@@ -258,6 +259,7 @@
             <errorLevel type="suppress">
                 <file name="src/Internal/SQLResultCasing.php"/>
                 <file name="src/Mapping/ClassMetadataFactory.php"/>
+                <file name="src/Utility/LockSqlHelper.php"/>
             </errorLevel>
         </TypeDoesNotContainType>
         <UndefinedClass>

diff --git a/src/Persisters/Entity/BasicEntityPersister.php b/src/Persisters/Entity/BasicEntityPersister.php
@@ -31,6 +31,7 @@
 use Doctrine\ORM\Repository\Exception\InvalidFindByCall;
 use Doctrine\ORM\UnitOfWork;
 use Doctrine\ORM\Utility\IdentifierFlattener;
+use Doctrine\ORM\Utility\LockSqlHelper;
 use Doctrine\ORM\Utility\PersisterHelper;
 use LengthException;
 
@@ -92,6 +93,8 @@
  */
 class BasicEntityPersister implements EntityPersister
 {
+    use LockSqlHelper;
+
     /** @var array<string,string> */
     private static $comparisonMap = [
         Comparison::EQ          => '= %s',
@@ -1116,11 +1119,11 @@ public function getSelectSQL($criteria, $assoc = null, $lockMode = null, $limit
 
         switch ($lockMode) {
             case LockMode::PESSIMISTIC_READ:
-                $lockSql = ' ' . $this->platform->getReadLockSQL();
+                $lockSql = ' ' . $this->getReadLockSQL($this->platform);
                 break;
 
             case LockMode::PESSIMISTIC_WRITE:
-                $lockSql = ' ' . $this->platform->getWriteLockSQL();
+                $lockSql = ' ' . $this->getWriteLockSQL($this->platform);
                 break;
         }
 
@@ -1578,11 +1581,11 @@ public function lock(array $criteria, $lockMode)
 
         switch ($lockMode) {
             case LockMode::PESSIMISTIC_READ:
-                $lockSql = $this->platform->getReadLockSQL();
+                $lockSql = $this->getReadLockSQL($this->platform);
 
                 break;
             case LockMode::PESSIMISTIC_WRITE:
-                $lockSql = $this->platform->getWriteLockSQL();
+                $lockSql = $this->getWriteLockSQL($this->platform);
                 break;
         }
 

diff --git a/src/Persisters/Entity/JoinedSubclassPersister.php b/src/Persisters/Entity/JoinedSubclassPersister.php
@@ -10,6 +10,7 @@
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Internal\SQLResultCasing;
 use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\ORM\Utility\LockSqlHelper;
 use Doctrine\ORM\Utility\PersisterHelper;
 use LengthException;
 
@@ -26,6 +27,7 @@
  */
 class JoinedSubclassPersister extends AbstractEntityInheritancePersister
 {
+    use LockSqlHelper;
     use SQLResultCasing;
 
     /**
@@ -316,12 +318,12 @@ public function getSelectSQL($criteria, $assoc = null, $lockMode = null, $limit
 
         switch ($lockMode) {
             case LockMode::PESSIMISTIC_READ:
-                $lockSql = ' ' . $this->platform->getReadLockSQL();
+                $lockSql = ' ' . $this->getReadLockSQL($this->platform);
 
                 break;
 
             case LockMode::PESSIMISTIC_WRITE:
-                $lockSql = ' ' . $this->platform->getWriteLockSQL();
+                $lockSql = ' ' . $this->getWriteLockSQL($this->platform);
 
                 break;
         }

diff --git a/src/Query/SqlWalker.php b/src/Query/SqlWalker.php
@@ -16,6 +16,7 @@
 use Doctrine\ORM\OptimisticLockException;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Utility\HierarchyDiscriminatorResolver;
+use Doctrine\ORM\Utility\LockSqlHelper;
 use Doctrine\ORM\Utility\PersisterHelper;
 use InvalidArgumentException;
 use LogicException;
@@ -48,6 +49,8 @@
  */
 class SqlWalker implements TreeWalker
 {
+    use LockSqlHelper;
+
     public const HINT_DISTINCT = 'doctrine.distinct';
 
     /**
@@ -577,11 +580,11 @@ public function walkSelectStatement(AST\SelectStatement $AST)
         }
 
         if ($lockMode === LockMode::PESSIMISTIC_READ) {
-            return $sql . ' ' . $this->platform->getReadLockSQL();
+            return $sql . ' ' . $this->getReadLockSQL($this->platform);
         }
 
         if ($lockMode === LockMode::PESSIMISTIC_WRITE) {
-            return $sql . ' ' . $this->platform->getWriteLockSQL();
+            return $sql . ' ' . $this->getWriteLockSQL($this->platform);
         }
 
         if ($lockMode !== LockMode::OPTIMISTIC) {

diff --git a/src/Utility/LockSqlHelper.php b/src/Utility/LockSqlHelper.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\ORM\Utility;
+
+use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Platforms\DB2Platform;
+use Doctrine\DBAL\Platforms\MySQLPlatform;
+use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
+use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Platforms\SQLServerPlatform;
+
+/** @internal */
+trait LockSqlHelper
+{
+    private function getReadLockSQL(AbstractPlatform $platform): string
+    {
+        if ($platform instanceof AbstractMySQLPlatform || $platform instanceof MySQLPlatform) {
+            return 'LOCK IN SHARE MODE';
+        }
+
+        if ($platform instanceof PostgreSQLPlatform) {
+            return 'FOR SHARE';
+        }
+
+        return $this->getWriteLockSQL($platform);
+    }
+
+    private function getWriteLockSQL(AbstractPlatform $platform): string
+    {
+        if ($platform instanceof DB2Platform) {
+            return 'WITH RR USE AND KEEP UPDATE LOCKS';
+        }
+
+        if ($platform instanceof SqlitePlatform) {
+            return '';
+        }
+
+        if ($platform instanceof SQLServerPlatform) {
+            return '';
+        }
+
+        return 'FOR UPDATE';
+    }
+}
diff --git a/tests/Tests/ORM/Functional/Locking/LockTest.php b/tests/Tests/ORM/Functional/Locking/LockTest.php
@@ -5,6 +5,7 @@
 namespace Doctrine\Tests\ORM\Functional\Locking;
 
 use Doctrine\DBAL\LockMode;
+use Doctrine\DBAL\Platforms\SQLitePlatform;
 use Doctrine\ORM\OptimisticLockException;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\TransactionRequiredException;
@@ -168,9 +169,7 @@ public function testRefreshWithLockPessimisticWriteNoTransactionThrowsException(
      */
     public function testLockPessimisticWrite(): void
     {
-        $writeLockSql = $this->_em->getConnection()->getDatabasePlatform()->getWriteLockSQL();
-
-        if (! $writeLockSql) {
+        if ($this->_em->getConnection()->getDatabasePlatform() instanceof SQLitePlatform) {
             self::markTestSkipped('Database Driver has no Write Lock support.');
         }
 
@@ -195,17 +194,15 @@ public function testLockPessimisticWrite(): void
             $lastLoggedQuery = $this->getLastLoggedQuery(1)['sql'];
         }
 
-        self::assertStringContainsString($writeLockSql, $lastLoggedQuery);
+        self::assertStringContainsString('FOR UPDATE', $lastLoggedQuery);
     }
 
     /**
      * @group locking
      */
     public function testRefreshWithLockPessimisticWrite(): void
     {
-        $writeLockSql = $this->_em->getConnection()->getDatabasePlatform()->getWriteLockSQL();
-
-        if (! $writeLockSql) {
+        if ($this->_em->getConnection()->getDatabasePlatform() instanceof SQLitePlatform) {
             self::markTestSkipped('Database Driver has no Write Lock support.');
         }
 
@@ -230,15 +227,13 @@ public function testRefreshWithLockPessimisticWrite(): void
             $lastLoggedQuery = $this->getLastLoggedQuery(1)['sql'];
         }
 
-        self::assertStringContainsString($writeLockSql, $lastLoggedQuery);
+        self::assertStringContainsString('FOR UPDATE', $lastLoggedQuery);
     }
 
     /** @group DDC-178 */
     public function testLockPessimisticRead(): void
     {
-        $readLockSql = $this->_em->getConnection()->getDatabasePlatform()->getReadLockSQL();
-
-        if (! $readLockSql) {
+        if ($this->_em->getConnection()->getDatabasePlatform() instanceof SQLitePlatform) {
             self::markTestSkipped('Database Driver has no Write Lock support.');
         }
 
@@ -264,7 +259,11 @@ public function testLockPessimisticRead(): void
             $lastLoggedQuery = $this->getLastLoggedQuery(1)['sql'];
         }
 
-        self::assertStringContainsString($readLockSql, $lastLoggedQuery);
+        self::assertThat($lastLoggedQuery, self::logicalOr(
+            self::stringContains('FOR UPDATE'),
+            self::stringContains('FOR SHARE'),
+            self::stringContains('LOCK IN SHARE MODE')
+        ));
     }
 
     /** @group DDC-1693 */